[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.74,1.75

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


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

Modified Files:
	dimuse_sndmgr.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: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- dimuse_sndmgr.cpp	10 Aug 2005 06:16:25 -0000	1.74
+++ dimuse_sndmgr.cpp	10 Aug 2005 12:42:56 -0000	1.75
@@ -588,7 +588,7 @@
 			if (!len) {
 				sprintf(fileName, "%s_reg%03d.ogg", soundHandle->name, region);
 				cmpFile = soundHandle->bundle->getFile(fileName, offs, len);
-#if !defined(USE_VORBIS) && !defined(USE_TREMOR)
+#ifndef USE_VORBIS
 				if (len)
 					error("Vorbis library compiled support needed!");
 #endif
@@ -596,7 +596,7 @@
 				oggMode = true;
 			}
 			if (!soundHandle->compressedStream) {
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 				if (oggMode)
 					soundHandle->compressedStream = makeVorbisStream(cmpFile, len);
 #endif





More information about the Scummvm-git-logs mailing list