diff options
| author | Johannes Schickel | 2010-02-03 09:42:40 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-02-03 09:42:40 +0000 |
| commit | 8ae24a27b3f6cb2272fd7c732c8583623c8164f4 (patch) | |
| tree | ee73d8040909083c53b0c53fba3d41d3f14b48d2 /engines/scumm | |
| parent | fe35d372dab08a2e202b5ecb41ccc14298f8cfbd (diff) | |
| download | scummvm-rg350-8ae24a27b3f6cb2272fd7c732c8583623c8164f4.tar.gz scummvm-rg350-8ae24a27b3f6cb2272fd7c732c8583623c8164f4.tar.bz2 scummvm-rg350-8ae24a27b3f6cb2272fd7c732c8583623c8164f4.zip | |
Yet more Flac -> FLAC changes for consistency.
svn-id: r47847
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/sound.cpp | 16 | ||||
| -rw-r--r-- | engines/scumm/sound.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 283bf81be0..a87bc835ec 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -649,7 +649,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle input = Audio::makeVorbisStream(tmp, DisposeAfterUse::YES); #endif break; - case kFlacMode: + case kFLACMode: #ifdef USE_FLAC assert(size > 0); tmp = _sfxFile->readStream(size); @@ -929,15 +929,15 @@ BaseScummFile *Sound::openSfxFile() { static const SoundFileExtensions extensions[] = { { "sou", kVOCMode }, - #ifdef USE_FLAC - { "sof", kFlacMode }, - #endif - #ifdef USE_VORBIS +#ifdef USE_FLAC + { "sof", kFLACMode }, +#endif +#ifdef USE_VORBIS { "sog", kVorbisMode }, - #endif - #ifdef USE_MAD +#endif +#ifdef USE_MAD { "so3", kMP3Mode }, - #endif +#endif { 0, kVOCMode } }; diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h index 57b73d3a04..401b1638cc 100644 --- a/engines/scumm/sound.h +++ b/engines/scumm/sound.h @@ -54,7 +54,7 @@ public: kVOCMode, kMP3Mode, kVorbisMode, - kFlacMode + kFLACMode }; protected: |