thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix mp3/vorbis detection

Browse source 
svn-id: r16681
This commit is contained in:
Nicolas Bacca 2005-01-28 23:30:51 +00:00
parent 577b04aaad
commit 83e9ca19df
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scumm/imuse_digi/dimuse_sndmgr.cpp
View file

@ -572,17 +572,17 @@ int32 ImuseDigiSndMgr::getDataFromRegion(soundStruct *soundHandle, int region, b
sprintf(fileName, "%s_reg%03d.mp3", soundHandle->name, region); sprintf(fileName, "%s_reg%03d.mp3", soundHandle->name, region);
cmpFile = soundHandle->bundle->getFile(fileName, offs, len); cmpFile = soundHandle->bundle->getFile(fileName, offs, len);
#ifndef USE_MAD #ifndef USE_MAD
if (cmpFile) if (len)
error("Mad library compiled support needed!"); error("Mad library compiled support needed!");
#endif #endif
if (!cmpFile) { if (!len) {
sprintf(fileName, "%s_reg%03d.ogg", soundHandle->name, region); sprintf(fileName, "%s_reg%03d.ogg", soundHandle->name, region);
cmpFile = soundHandle->bundle->getFile(fileName, offs, len); cmpFile = soundHandle->bundle->getFile(fileName, offs, len);
#ifndef USE_VORBIS #ifndef USE_VORBIS
if (cmpFile) if (len)
error("Vorbis library compiled support needed!"); error("Vorbis library compiled support needed!");
#endif #endif
assert(cmpFile); assert(len);
oggMode = true; oggMode = true;
} }
if (!soundHandle->compressedStream) { if (!soundHandle->compressedStream) {