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/tinsel | |
| 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/tinsel')
| -rw-r--r-- | engines/tinsel/sound.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 9beece40cb..9fef0d830e 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -139,19 +139,19 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound // play it switch (_soundMode) { case kMP3Mode: - #ifdef USE_MAD +#ifdef USE_MAD sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES); - #endif +#endif break; case kVorbisMode: - #ifdef USE_VORBIS +#ifdef USE_VORBIS sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES); - #endif +#endif break; case kFlacMode: - #ifdef USE_FLAC - sampleStream = Audio::makeFlacStream(compressedStream, DisposeAfterUse::YES); - #endif +#ifdef USE_FLAC + sampleStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES); +#endif break; default: sampleStream = Audio::makeRawStream(sampleBuf, sampleLen, 22050, Audio::FLAG_UNSIGNED); @@ -288,19 +288,19 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p switch (_soundMode) { case kMP3Mode: - #ifdef USE_MAD +#ifdef USE_MAD sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES); - #endif +#endif break; case kVorbisMode: - #ifdef USE_VORBIS +#ifdef USE_VORBIS sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES); - #endif +#endif break; case kFlacMode: - #ifdef USE_FLAC - sampleStream = Audio::makeFlacStream(compressedStream, DisposeAfterUse::YES); - #endif +#ifdef USE_FLAC + sampleStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES); +#endif break; default: sampleStream = Audio::makeADPCMStream(compressedStream, DisposeAfterUse::YES, sampleLen, Audio::kADPCMTinsel6, 22050, 1, 24); |