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/sword2 | |
| 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/sword2')
| -rw-r--r-- | engines/sword2/music.cpp | 16 | ||||
| -rw-r--r-- | engines/sword2/sound.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index 41b2d62c4a..09c2117443 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -97,15 +97,15 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, const char *ext; int mode; } file_types[] = { - #ifdef USE_FLAC - { "clf", kFlacMode }, - #endif - #ifdef USE_VORBIS +#ifdef USE_FLAC + { "clf", kFLACMode }, +#endif +#ifdef USE_VORBIS { "clg", kVorbisMode }, - #endif - #ifdef USE_MAD +#endif +#ifdef USE_MAD { "cl3", kMP3Mode }, - #endif +#endif { "clu", kCLUMode } }; @@ -207,7 +207,7 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, return Audio::makeVorbisStream(tmp, DisposeAfterUse::YES); #endif #ifdef USE_FLAC - case kFlacMode: + case kFLACMode: tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len); return Audio::makeFLACStream(tmp, DisposeAfterUse::YES); #endif diff --git a/engines/sword2/sound.h b/engines/sword2/sound.h index f58794c8f1..f59d6a3434 100644 --- a/engines/sword2/sound.h +++ b/engines/sword2/sound.h @@ -56,7 +56,7 @@ enum { kCLUMode = 1, kMP3Mode, kVorbisMode, - kFlacMode + kFLACMode }; enum { |