diff options
| author | Johannes Schickel | 2010-02-03 09:42:11 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-02-03 09:42:11 +0000 |
| commit | fe35d372dab08a2e202b5ecb41ccc14298f8cfbd (patch) | |
| tree | 447b16207cb64222d62b6c244fcfccd2aa743cc7 /engines/scumm/sound.cpp | |
| parent | 9cad13957da8a67e68dd4e268eb53f8e413eb4be (diff) | |
| download | scummvm-rg350-fe35d372dab08a2e202b5ecb41ccc14298f8cfbd.tar.gz scummvm-rg350-fe35d372dab08a2e202b5ecb41ccc14298f8cfbd.tar.bz2 scummvm-rg350-fe35d372dab08a2e202b5ecb41ccc14298f8cfbd.zip | |
- Rename FlacStream to FLACStream.
- Rename makeFlacStream to makeFLACStream.
svn-id: r47846
Diffstat (limited to 'engines/scumm/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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); |