[Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.22,1.23 audiostream.cpp,1.75,1.76 vorbis.cpp,1.27,1.28 vorbis.h,1.11,1.12

[Jonathan Gray]

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

Modified Files:
	audiocd.cpp audiostream.cpp vorbis.cpp vorbis.h 
Log Message:
Rest of the changes required for tremor to actually work.

Based on patches against 0.7.1 by Jolan Luff.


Index: audiocd.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- audiocd.cpp	30 Jul 2005 21:11:42 -0000	1.22
+++ audiocd.cpp	10 Aug 2005 06:16:25 -0000	1.23
@@ -46,13 +46,13 @@
 	/* decoderName,		openTrackFunction */
 #ifdef USE_FLAC
 	{ "Flac",			getFlacTrack },
-#endif // #ifdef USE_FLAC
-#ifdef USE_VORBIS
+#endif
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
 	{ "Ogg Vorbis",		getVorbisTrack },
-#endif // #ifdef USE_VORBIS
+#endif
 #ifdef USE_MAD
 	{ "Mpeg Layer 3",	getMP3Track },
-#endif // #ifdef USE_MAD
+#endif
 
 	{ NULL, NULL } // Terminator
 };

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- audiostream.cpp	30 Jul 2005 21:11:42 -0000	1.75
+++ audiostream.cpp	10 Aug 2005 06:16:25 -0000	1.76
@@ -44,13 +44,13 @@
 #ifdef USE_FLAC
 	{ "Flac",			"flac", makeFlacStream },
 	{ "Flac",			"fla",  makeFlacStream },
-#endif // #ifdef USE_FLAC
-#ifdef USE_VORBIS
+#endif
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
 	{ "Ogg Vorbis",		"ogg",  makeVorbisStream },
-#endif // #ifdef USE_VORBIS
+#endif
 #ifdef USE_MAD
 	{ "Mpeg Layer 3",	"mp3",  makeMP3Stream },
-#endif // #ifdef USE_MAD
+#endif
 
 	{ NULL, NULL, NULL } // Terminator
 };

Index: vorbis.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- vorbis.cpp	30 Jul 2005 21:11:43 -0000	1.27
+++ vorbis.cpp	10 Aug 2005 06:16:25 -0000	1.28
@@ -168,16 +168,12 @@
 	}
 }
 
-#ifdef CHUNKSIZE
-#define VORBIS_TREMOR
-#endif
-
 void VorbisTrackInfo::play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration) {
 
 	bool err = openTrack();
 	assert(!err);
 
-#ifdef VORBIS_TREMOR
+#ifdef USE_TREMOR
 	ov_time_seek(&_ov_file, (ogg_int64_t)(startFrame / 75.0 * 1000));
 #else
 	ov_time_seek(&_ov_file, startFrame / 75.0);
@@ -234,12 +230,6 @@
 
 };
 
-
-#ifdef CHUNKSIZE
-#define VORBIS_TREMOR
-#endif
-
-
 VorbisInputStream::VorbisInputStream(OggVorbis_File *file, int duration, bool deleteFileAfterUse)
 	: _ov_file(file),
 	_bufferEnd(_buffer + ARRAYSIZE(_buffer)),
@@ -290,7 +280,7 @@
 
 	while (len_left > 0 && _end_pos > ov_pcm_tell(_ov_file)) {
 		long result = ov_read(_ov_file, read_pos, len_left,
-#ifndef VORBIS_TREMOR
+#ifndef USE_TREMOR
 #ifdef SCUMM_BIG_ENDIAN
 						1,
 #else

Index: vorbis.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- vorbis.h	24 Jun 2005 15:23:48 -0000	1.11
+++ vorbis.h	10 Aug 2005 06:16:25 -0000	1.12
@@ -25,7 +25,7 @@
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
 
 class AudioStream;
 class DigitalTrackInfo;