From fe35d372dab08a2e202b5ecb41ccc14298f8cfbd Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 3 Feb 2010 09:42:11 +0000 Subject: - Rename FlacStream to FLACStream. - Rename makeFlacStream to makeFLACStream. svn-id: r47846 --- engines/scumm/sound.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'engines/scumm/sound.cpp') 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); -- cgit v1.2.3