aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2005-01-28 11:43:25 +0000
committerPaweł Kołodziejski2005-01-28 11:43:25 +0000
commitad7cc6cef492aced6d695b945a93f639a3815756 (patch)
tree92939365707f4508c35c54b86627a77ef2ea86c1 /scumm
parente891988298ccc9077bf802fbacabbff36cd5a9b5 (diff)
downloadscummvm-rg350-ad7cc6cef492aced6d695b945a93f639a3815756.tar.gz
scummvm-rg350-ad7cc6cef492aced6d695b945a93f639a3815756.tar.bz2
scummvm-rg350-ad7cc6cef492aced6d695b945a93f639a3815756.zip
add checks for mad and vorbis define
svn-id: r16659
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse_digi/dimuse_sndmgr.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp
index 9acc04f3b7..5374150a50 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -578,10 +578,14 @@ int32 ImuseDigiSndMgr::getDataFromRegion(soundStruct *soundHandle, int region, b
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());