[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.60,1.61
Pawel Kolodziejski
aquadran at users.sourceforge.net
Fri Jan 28 03:44:08 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18303
Modified Files:
dimuse_sndmgr.cpp
Log Message:
add checks for mad and vorbis define
Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- dimuse_sndmgr.cpp 28 Jan 2005 11:03:34 -0000 1.60
+++ dimuse_sndmgr.cpp 28 Jan 2005 11:43:25 -0000 1.61
@@ -578,10 +578,14 @@
oggMode = true;
}
if (!soundHandle->compressedStream) {
+#ifdef USE_VORBIS
if (oggMode)
soundHandle->compressedStream = makeVorbisStream(cmpFile, len);
else
+#endif
+#ifdef USE_MAD
soundHandle->compressedStream = makeMP3Stream(cmpFile, len);
+#endif
assert(soundHandle->compressedStream);
assert(soundHandle->compressedStream->getRate() == 22050);
assert(soundHandle->compressedStream->isStereo());
More information about the Scummvm-git-logs
mailing list