[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.64,1.65
Nicolas Bacca
arisme at users.sourceforge.net
Fri Jan 28 15:34:33 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25344
Modified Files:
dimuse_sndmgr.cpp
Log Message:
Fix mp3/vorbis detection
Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- dimuse_sndmgr.cpp 28 Jan 2005 15:04:37 -0000 1.64
+++ dimuse_sndmgr.cpp 28 Jan 2005 23:30:51 -0000 1.65
@@ -572,17 +572,17 @@
sprintf(fileName, "%s_reg%03d.mp3", soundHandle->name, region);
cmpFile = soundHandle->bundle->getFile(fileName, offs, len);
#ifndef USE_MAD
- if (cmpFile)
+ if (len)
error("Mad library compiled support needed!");
#endif
- if (!cmpFile) {
+ if (!len) {
sprintf(fileName, "%s_reg%03d.ogg", soundHandle->name, region);
cmpFile = soundHandle->bundle->getFile(fileName, offs, len);
#ifndef USE_VORBIS
- if (cmpFile)
+ if (len)
error("Vorbis library compiled support needed!");
#endif
- assert(cmpFile);
+ assert(len);
oggMode = true;
}
if (!soundHandle->compressedStream) {
More information about the Scummvm-git-logs
mailing list