[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.471,1.472

[Jonathan Gray]

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

Modified Files:
	sound.cpp 
Log Message:
Don't explicity check for tremor and vorbis everywhere and
require both USE_TREMOR and USE_VORBIS to be defined when
using tremor.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -d -r1.471 -r1.472
--- sound.cpp	10 Aug 2005 06:16:25 -0000	1.471
+++ sound.cpp	10 Aug 2005 12:42:56 -0000	1.472
@@ -792,7 +792,7 @@
 	#endif
 			break;
 		case kVorbisMode:
-	#if defined(USE_VORBIS) || defined(USE_TREMOR)
+	#ifdef USE_VORBIS
 			assert(size > 0);
 			input = makeVorbisStream(_sfxFile, size);
 	#endif
@@ -1124,7 +1124,7 @@
 	#ifdef USE_FLAC
 		{ "sof", kFlacMode },
 	#endif
-	#if defined(USE_VORBIS) || defined(USE_TREMOR)
+	#ifdef USE_VORBIS
 		{ "sog", kVorbisMode },
 	#endif
 	#ifdef USE_MAD