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

[Jonathan Gray]

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

Modified Files:
	dimuse_sndmgr.cpp 
Log Message:
Rest of the changes required for tremor to actually work.

Based on patches against 0.7.1 by Jolan Luff.


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