[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.154,1.155

Jonathan Gray khalek at users.sourceforge.net
Wed Aug 10 05:46:28 CEST 2005


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

Modified Files:
	d_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: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- d_sound.cpp	10 Aug 2005 06:16:26 -0000	1.154
+++ d_sound.cpp	10 Aug 2005 12:42:56 -0000	1.155
@@ -51,7 +51,7 @@
 	#ifdef USE_MAD
 			{ "cl3", kMP3Mode },
 	#endif
-	#if defined(USE_VORBIS) || defined(USE_TREMOR)
+	#ifdef USE_VORBIS
 			{ "clg", kVorbisMode },
 	#endif
 	#ifdef USE_FLAC
@@ -135,7 +135,7 @@
 	case kMP3Mode:
 		return makeMP3Stream(fh->file, enc_len);
 #endif
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 	case kVorbisMode:
 		return makeVorbisStream(fh->file, enc_len);
 #endif





More information about the Scummvm-git-logs mailing list