aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel
diff options
context:
space:
mode:
authorJohannes Schickel2010-02-03 09:42:40 +0000
committerJohannes Schickel2010-02-03 09:42:40 +0000
commit8ae24a27b3f6cb2272fd7c732c8583623c8164f4 (patch)
treeee73d8040909083c53b0c53fba3d41d3f14b48d2 /engines/tinsel
parentfe35d372dab08a2e202b5ecb41ccc14298f8cfbd (diff)
downloadscummvm-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/tinsel')
-rw-r--r--engines/tinsel/sound.cpp6
-rw-r--r--engines/tinsel/sound.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index 9fef0d830e..370b2e0a82 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -148,7 +148,7 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound
sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
#endif
break;
- case kFlacMode:
+ case kFLACMode:
#ifdef USE_FLAC
sampleStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES);
#endif
@@ -297,7 +297,7 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p
sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
#endif
break;
- case kFlacMode:
+ case kFLACMode:
#ifdef USE_FLAC
sampleStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES);
#endif
@@ -522,7 +522,7 @@ void SoundManager::openSampleFiles() {
case MKID_BE('FLAC'):
debugC(DEBUG_DETAILED, kTinselDebugSound, "Detected FLAC sound-data");
- _soundMode = kFlacMode;
+ _soundMode = kFLACMode;
break;
default:
diff --git a/engines/tinsel/sound.h b/engines/tinsel/sound.h
index 36c5af1891..b8990f0106 100644
--- a/engines/tinsel/sound.h
+++ b/engines/tinsel/sound.h
@@ -62,7 +62,7 @@ protected:
kVOCMode,
kMP3Mode,
kVorbisMode,
- kFlacMode
+ kFLACMode
};
struct Channel {