[Scummvm-cvs-logs] SF.net SVN: scummvm:[47847] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Feb 3 10:42:41 CET 2010
Revision: 47847
http://scummvm.svn.sourceforge.net/scummvm/?rev=47847&view=rev
Author: lordhoto
Date: 2010-02-03 09:42:40 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
Yet more Flac -> FLAC changes for consistency.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/sound.cpp
scummvm/trunk/engines/scumm/sound.h
scummvm/trunk/engines/sword1/sound.cpp
scummvm/trunk/engines/sword1/sound.h
scummvm/trunk/engines/sword2/music.cpp
scummvm/trunk/engines/sword2/sound.h
scummvm/trunk/engines/tinsel/sound.cpp
scummvm/trunk/engines/tinsel/sound.h
scummvm/trunk/sound/decoders/flac.cpp
Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp 2010-02-03 09:42:11 UTC (rev 47846)
+++ scummvm/trunk/engines/scumm/sound.cpp 2010-02-03 09:42:40 UTC (rev 47847)
@@ -649,7 +649,7 @@
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 @@
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 }
};
Modified: scummvm/trunk/engines/scumm/sound.h
===================================================================
--- scummvm/trunk/engines/scumm/sound.h 2010-02-03 09:42:11 UTC (rev 47846)
+++ scummvm/trunk/engines/scumm/sound.h 2010-02-03 09:42:40 UTC (rev 47847)
@@ -54,7 +54,7 @@
kVOCMode,
kMP3Mode,
kVorbisMode,
- kFlacMode
+ kFLACMode
};
protected:
Modified: scummvm/trunk/engines/sword1/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sound.cpp 2010-02-03 09:42:11 UTC (rev 47846)
+++ scummvm/trunk/engines/sword1/sound.cpp 2010-02-03 09:42:40 UTC (rev 47847)
@@ -377,7 +377,7 @@
_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 @@
}
#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 @@
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 @@
_cowFile.open(cowName);
if (_cowFile.isOpen()) {
debug(1, "Using MP3 compressed Speech Cluster");
- _cowMode = CowMp3;
+ _cowMode = CowMP3;
}
}
#endif
Modified: scummvm/trunk/engines/sword1/sound.h
===================================================================
--- scummvm/trunk/engines/sword1/sound.h 2010-02-03 09:42:11 UTC (rev 47846)
+++ scummvm/trunk/engines/sword1/sound.h 2010-02-03 09:42:40 UTC (rev 47847)
@@ -66,9 +66,9 @@
enum CowMode {
CowWave = 0,
- CowFlac,
+ CowFLAC,
CowVorbis,
- CowMp3,
+ CowMP3,
CowDemo,
CowPSX
};
Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp 2010-02-03 09:42:11 UTC (rev 47846)
+++ scummvm/trunk/engines/sword2/music.cpp 2010-02-03 09:42:40 UTC (rev 47847)
@@ -97,15 +97,15 @@
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 @@
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
Modified: scummvm/trunk/engines/sword2/sound.h
===================================================================
--- scummvm/trunk/engines/sword2/sound.h 2010-02-03 09:42:11 UTC (rev 47846)
+++ scummvm/trunk/engines/sword2/sound.h 2010-02-03 09:42:40 UTC (rev 47847)
@@ -56,7 +56,7 @@
kCLUMode = 1,
kMP3Mode,
kVorbisMode,
- kFlacMode
+ kFLACMode
};
enum {
Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp 2010-02-03 09:42:11 UTC (rev 47846)
+++ scummvm/trunk/engines/tinsel/sound.cpp 2010-02-03 09:42:40 UTC (rev 47847)
@@ -148,7 +148,7 @@
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 @@
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 @@
case MKID_BE('FLAC'):
debugC(DEBUG_DETAILED, kTinselDebugSound, "Detected FLAC sound-data");
- _soundMode = kFlacMode;
+ _soundMode = kFLACMode;
break;
default:
Modified: scummvm/trunk/engines/tinsel/sound.h
===================================================================
--- scummvm/trunk/engines/tinsel/sound.h 2010-02-03 09:42:11 UTC (rev 47846)
+++ scummvm/trunk/engines/tinsel/sound.h 2010-02-03 09:42:40 UTC (rev 47847)
@@ -62,7 +62,7 @@
kVOCMode,
kMP3Mode,
kVorbisMode,
- kFlacMode
+ kFLACMode
};
struct Channel {
Modified: scummvm/trunk/sound/decoders/flac.cpp
===================================================================
--- scummvm/trunk/sound/decoders/flac.cpp 2010-02-03 09:42:11 UTC (rev 47846)
+++ scummvm/trunk/sound/decoders/flac.cpp 2010-02-03 09:42:40 UTC (rev 47847)
@@ -76,7 +76,7 @@
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 @@
#pragma mark -
-#pragma mark --- Flac factory functions ---
+#pragma mark --- FLAC factory functions ---
#pragma mark -
SeekableAudioStream *makeFLACStream(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list