diff options
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index e1e6083db9..8b11c0aadd 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -704,7 +704,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte assert(tmp); #ifdef USE_FLAC if (soundMode == 3) - soundDesc->compressedStream = Audio::makeFlacStream(tmp, DisposeAfterUse::YES); + soundDesc->compressedStream = Audio::makeFLACStream(tmp, DisposeAfterUse::YES); #endif #ifdef USE_VORBIS if (soundMode == 2) diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index aed412039a..283bf81be0 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -634,28 +634,28 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle switch (_soundMode) { case kMP3Mode: - #ifdef USE_MAD +#ifdef USE_MAD assert(size > 0); tmp = _sfxFile->readStream(size); assert(tmp); input = Audio::makeMP3Stream(tmp, DisposeAfterUse::YES); - #endif +#endif break; case kVorbisMode: - #ifdef USE_VORBIS +#ifdef USE_VORBIS assert(size > 0); tmp = _sfxFile->readStream(size); assert(tmp); input = Audio::makeVorbisStream(tmp, DisposeAfterUse::YES); - #endif +#endif break; case kFlacMode: - #ifdef USE_FLAC +#ifdef USE_FLAC assert(size > 0); tmp = _sfxFile->readStream(size); assert(tmp); - input = Audio::makeFlacStream(tmp, DisposeAfterUse::YES); - #endif + input = Audio::makeFLACStream(tmp, DisposeAfterUse::YES); +#endif break; default: input = Audio::makeVOCStream(*_sfxFile, Audio::FLAG_UNSIGNED); |