Yet more Flac -> FLAC changes for consistency.

svn-id: r47847

9 files changed, 31 insertions, 31 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:
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index cc7beaee9a..1c34d5380c 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -377,7 +377,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) {
 			_waveVolPos = 0;
 		}
 #ifdef USE_FLAC
-		else if (_cowMode == CowFlac) {
+		else if (_cowMode == CowFLAC) {
 			_cowFile.seek(index);
 			Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize);
 			assert(tmp);
@@ -405,7 +405,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) {
 		}
 #endif
 #ifdef USE_MAD
-		else if (_cowMode == CowMp3) {
+		else if (_cowMode == CowMP3) {
 			_cowFile.seek(index);
 			Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize);
 			assert(tmp);
@@ -570,8 +570,8 @@ void Sound::initCowSystem() {
 		sprintf(cowName, "SPEECH%d.CLF", SwordEngine::_systemVars.currentCD);
 		_cowFile.open(cowName);
 		if (_cowFile.isOpen()) {
-			debug(1, "Using Flac compressed Speech Cluster");
-			_cowMode = CowFlac;
+			debug(1, "Using FLAC compressed Speech Cluster");
+			_cowMode = CowFLAC;
 		}
 	}
 #endif
@@ -591,7 +591,7 @@ void Sound::initCowSystem() {
 		_cowFile.open(cowName);
 		if (_cowFile.isOpen()) {
 			debug(1, "Using MP3 compressed Speech Cluster");
-			_cowMode = CowMp3;
+			_cowMode = CowMP3;
 		}
 	}
 #endif
diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h
index 68be0e56e2..4a92f79e34 100644
--- a/engines/sword1/sound.h
+++ b/engines/sword1/sound.h
@@ -66,9 +66,9 @@ class ResMan;
 
 enum CowMode {
 	CowWave = 0,
-	CowFlac,
+	CowFLAC,
 	CowVorbis,
-	CowMp3,
+	CowMP3,
 	CowDemo,
 	CowPSX
 };
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 {
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 {
diff --git a/sound/decoders/flac.cpp b/sound/decoders/flac.cpp
index 86437bfe7b..91c48199e3 100644
--- a/sound/decoders/flac.cpp
+++ b/sound/decoders/flac.cpp
@@ -76,7 +76,7 @@ typedef FLAC__StreamDecoder FLAC__SeekableStreamDecoder;
 namespace Audio {
 
 #pragma mark -
-#pragma mark --- Flac stream ---
+#pragma mark --- FLAC stream ---
 #pragma mark -
 
 static const uint MAX_OUTPUT_CHANNELS = 2;
@@ -723,7 +723,7 @@ void FLACStream::callWrapError(const ::FLAC__SeekableStreamDecoder *decoder, ::F
 
 
 #pragma mark -
-#pragma mark --- Flac factory functions ---
+#pragma mark --- FLAC factory functions ---
 #pragma mark -
 
 SeekableAudioStream *makeFLACStream(