[Scummvm-cvs-logs] CVS: scummvm/sound vorbis.cpp,1.34,1.35

[Lars Persson]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31925/sound

Modified Files:
	vorbis.cpp 
Log Message:
1. New build structure for Symbian builds to allow easier build and project updates
2. Updated framework files for new structure
3. Uncommented Debug statements in vorbis.cpp (Should probably be removed alltogether.
4. Incorporated Sevs code formatting changes in the new Symbian source structure.
5. Removed/Changed EScummVM to ScummVM instead, hopefully most cases covered.
6. Beginning vibration support to be used for Scumm shake effects (Work ongoing by SumthinWicked)
7. Replaced the ScummVM icon for the FavIcon and upscaled the icon to 32x32. I think it looks ok, comments are welcome.
8. Built for S60V1 and UIQ2 targets from the cvs
9. Updated Readme with new build instructions.

Any comments are welcome.  Hopefully the other builds are not affected by this and all Sevs code updates are also incorporated.

Index: vorbis.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- vorbis.cpp	2 Dec 2005 18:36:21 -0000	1.34
+++ vorbis.cpp	3 Dec 2005 21:29:12 -0000	1.35
@@ -158,7 +158,7 @@
 
 
 VorbisTrackInfo::VorbisTrackInfo(File *file) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 
 	_file = file;
 	if (openTrack()) {
@@ -173,7 +173,7 @@
 }
 
 bool VorbisTrackInfo::openTrack() {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 	assert(_file);
 
 	file_info *f = new file_info;
@@ -209,7 +209,7 @@
 }
 
 VorbisTrackInfo::~VorbisTrackInfo() {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 	if (! _error_flag) {
 		ov_clear(&_ov_file);
 		_file->decRef();
@@ -217,8 +217,8 @@
 }
 
 void VorbisTrackInfo::play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration) {
-debug(5, "" __FILE__ ":%i", __LINE__);
-	bool err = openTrack();
+//debug(5, "" __FILE__ ":%i", __LINE__);
+	bool err = openTrack(); err=err;//satisfy unused variable
 	assert(!err);
 
 #ifdef USE_TREMOR // In Tremor, the ov_time_seek() and ov_time_seek_page() calls take seeking positions in milliseconds as 64 bit integers, rather than in seconds as doubles as in Vorbisfile.
@@ -236,7 +236,7 @@
 }
 
 DigitalTrackInfo *getVorbisTrack(int track) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 	char track_name[32];
 	File *file = new File();
 
@@ -287,7 +287,7 @@
 	: _ov_file(file),
 	_bufferEnd(_buffer + ARRAYSIZE(_buffer)),
 	_deleteFileAfterUse(deleteFileAfterUse) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 
 	// Check the header, determine if this is a stereo stream
 	_numChannels = ov_info(_ov_file, -1)->channels;
@@ -303,19 +303,19 @@
 }
 
 VorbisInputStream::~VorbisInputStream() {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 	ov_clear(_ov_file);
 	if (_deleteFileAfterUse)
 		delete _ov_file;
 }
 
 inline bool VorbisInputStream::eosIntern() const {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 	return _pos >= _bufferEnd;
 }
 
 int VorbisInputStream::readBuffer(int16 *buffer, const int numSamples) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 	int samples = 0;
 	while (samples < numSamples && !eosIntern()) {
 		const int len = MIN(numSamples - samples, (int)(_bufferEnd - _pos));
@@ -331,7 +331,7 @@
 }
 
 void VorbisInputStream::refill() {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 	// Read the samples
 	uint len_left = sizeof(_buffer);
 	char *read_pos = (char *)_buffer;
@@ -369,12 +369,12 @@
 }
 
 static AudioStream *makeVorbisStream(OggVorbis_File *file, int duration) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 	return new VorbisInputStream(file, duration, false);
 }
 
 AudioStream *makeVorbisStream(File *file, uint32 size) {
-debug(5, "" __FILE__ ":%i", __LINE__);
+//debug(5, "" __FILE__ ":%i", __LINE__);
 	OggVorbis_File *ov_file = new OggVorbis_File;
 	file_info *f = new file_info;