aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse_digi
diff options
context:
space:
mode:
authorNicolas Bacca2005-01-28 23:30:51 +0000
committerNicolas Bacca2005-01-28 23:30:51 +0000
commit83e9ca19dfd88c6724a4b413164711613a39ef1c (patch)
treeb0b3b0d4d8d6e9b48005eaa3b446fe18b3116395 /scumm/imuse_digi
parent577b04aaade063db87ce93649de77ce2fe795fcf (diff)
downloadscummvm-rg350-83e9ca19dfd88c6724a4b413164711613a39ef1c.tar.gz
scummvm-rg350-83e9ca19dfd88c6724a4b413164711613a39ef1c.tar.bz2
scummvm-rg350-83e9ca19dfd88c6724a4b413164711613a39ef1c.zip
Fix mp3/vorbis detection
svn-id: r16681
Diffstat (limited to 'scumm/imuse_digi')
-rw-r--r--scumm/imuse_digi/dimuse_sndmgr.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp
index 7881e16d8d..c19fbcdefc 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -572,17 +572,17 @@ int32 ImuseDigiSndMgr::getDataFromRegion(soundStruct *soundHandle, int region, b
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) {