[Scummvm-cvs-logs] SF.net SVN: scummvm:[47846] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Feb 3 10:42:12 CET 2010
Revision: 47846
http://scummvm.svn.sourceforge.net/scummvm/?rev=47846&view=rev
Author: lordhoto
Date: 2010-02-03 09:42:11 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
- Rename FlacStream to FLACStream.
- Rename makeFlacStream to makeFLACStream.
Modified Paths:
--------------
scummvm/trunk/engines/agos/sound.cpp
scummvm/trunk/engines/kyra/sound.cpp
scummvm/trunk/engines/kyra/sound_digital.cpp
scummvm/trunk/engines/queen/sound.cpp
scummvm/trunk/engines/saga/music.cpp
scummvm/trunk/engines/saga/sound.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
scummvm/trunk/engines/scumm/sound.cpp
scummvm/trunk/engines/sword1/music.cpp
scummvm/trunk/engines/sword1/sound.cpp
scummvm/trunk/engines/sword2/music.cpp
scummvm/trunk/engines/tinsel/sound.cpp
scummvm/trunk/engines/touche/resource.cpp
scummvm/trunk/engines/tucker/resource.cpp
scummvm/trunk/sound/audiostream.cpp
scummvm/trunk/sound/decoders/flac.cpp
scummvm/trunk/sound/decoders/flac.h
Modified: scummvm/trunk/engines/agos/sound.cpp
===================================================================
--- scummvm/trunk/engines/agos/sound.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/agos/sound.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -364,14 +364,14 @@
#pragma mark -
#ifdef USE_FLAC
-class FlacSound : public CompressedSound {
+class FLACSound : public CompressedSound {
public:
- FlacSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
+ FLACSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
Audio::AudioStream *makeAudioStream(uint sound) {
Common::MemoryReadStream *tmp = loadStream(sound);
if (!tmp)
return NULL;
- return Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
+ return Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
}
};
#endif
@@ -383,7 +383,7 @@
#ifdef USE_FLAC
file->open(basename + ".fla");
if (file->isOpen()) {
- return new FlacSound(mixer, file);
+ return new FLACSound(mixer, file);
}
#endif
#ifdef USE_VORBIS
Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/kyra/sound.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -273,8 +273,8 @@
#endif // USE_VORBIS
#ifdef USE_FLAC
- { ".VOF", Audio::makeFlacStream },
- { ".FLA", Audio::makeFlacStream },
+ { ".VOF", Audio::makeFLACStream },
+ { ".FLA", Audio::makeFLACStream },
#endif // USE_FLAC
{ 0, 0 }
Modified: scummvm/trunk/engines/kyra/sound_digital.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_digital.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/kyra/sound_digital.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -531,7 +531,7 @@
const SoundDigital::AudioCodecs SoundDigital::_supportedCodecs[] = {
#ifdef USE_FLAC
- { ".FLA", Audio::makeFlacStream },
+ { ".FLA", Audio::makeFLACStream },
#endif // USE_FLAC
#ifdef USE_VORBIS
{ ".OGG", Audio::makeVorbisStream },
Modified: scummvm/trunk/engines/queen/sound.cpp
===================================================================
--- scummvm/trunk/engines/queen/sound.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/queen/sound.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -147,7 +147,7 @@
void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
Common::MemoryReadStream *tmp = f->readStream(size);
assert(tmp);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeFlacStream(tmp, DisposeAfterUse::YES)));
+ _mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeFLACStream(tmp, DisposeAfterUse::YES)));
}
};
#endif // #ifdef USE_FLAC
Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/saga/music.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -322,7 +322,7 @@
#endif
} else if (identifier == 2) { // FLAC
#ifdef USE_FLAC
- audioStream = Audio::makeFlacStream(musicStream, DisposeAfterUse::YES);
+ audioStream = Audio::makeFLACStream(musicStream, DisposeAfterUse::YES);
#endif
}
}
Modified: scummvm/trunk/engines/saga/sound.cpp
===================================================================
--- scummvm/trunk/engines/saga/sound.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/saga/sound.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -90,7 +90,7 @@
#endif
#ifdef USE_FLAC
case kSoundFLAC:
- stream = Audio::makeFlacStream(memStream, DisposeAfterUse::YES);
+ stream = Audio::makeFLACStream(memStream, DisposeAfterUse::YES);
break;
#endif
default:
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -704,7 +704,7 @@
assert(tmp);
#ifdef USE_FLAC
if (soundMode == 3)
- soundDesc->compressedStream = Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
+ soundDesc->compressedStream = Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
#endif
#ifdef USE_VORBIS
if (soundMode == 2)
Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/scumm/sound.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -634,28 +634,28 @@
switch (_soundMode) {
case kMP3Mode:
- #ifdef USE_MAD
+#ifdef USE_MAD
assert(size > 0);
tmp = _sfxFile->readStream(size);
assert(tmp);
input = Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kVorbisMode:
- #ifdef USE_VORBIS
+#ifdef USE_VORBIS
assert(size > 0);
tmp = _sfxFile->readStream(size);
assert(tmp);
input = Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kFlacMode:
- #ifdef USE_FLAC
+#ifdef USE_FLAC
assert(size > 0);
tmp = _sfxFile->readStream(size);
assert(tmp);
- input = Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
- #endif
+ input = Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
+#endif
break;
default:
input = Audio::makeVOCStream(*_sfxFile, Audio::FLAG_UNSIGNED);
Modified: scummvm/trunk/engines/sword1/music.cpp
===================================================================
--- scummvm/trunk/engines/sword1/music.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/sword1/music.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -63,7 +63,7 @@
if (!_audioSource) {
sprintf(fileName, "%s.flac", fileBase);
if (_file.open(fileName)) {
- _audioSource = Audio::makeLoopingAudioStream(Audio::makeFlacStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1);
+ _audioSource = Audio::makeLoopingAudioStream(Audio::makeFLACStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1);
if (!_audioSource)
_file.close();
}
@@ -72,7 +72,7 @@
if (!_audioSource) {
sprintf(fileName, "%s.fla", fileBase);
if (_file.open(fileName)) {
- _audioSource = Audio::makeLoopingAudioStream(Audio::makeFlacStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1);
+ _audioSource = Audio::makeLoopingAudioStream(Audio::makeFLACStream(&_file, DisposeAfterUse::NO), loop ? 0 : 1);
if (!_audioSource)
_file.close();
}
Modified: scummvm/trunk/engines/sword1/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sound.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/sword1/sound.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -381,7 +381,7 @@
_cowFile.seek(index);
Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize);
assert(tmp);
- stream = Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
+ stream = Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
// with compressed audio, we can't calculate the wave volume.
// so default to talking.
Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/sword2/music.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -209,7 +209,7 @@
#ifdef USE_FLAC
case kFlacMode:
tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
- return Audio::makeFlacStream(tmp, DisposeAfterUse::YES);
+ return Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
#endif
default:
return NULL;
Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/tinsel/sound.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -139,19 +139,19 @@
// play it
switch (_soundMode) {
case kMP3Mode:
- #ifdef USE_MAD
+#ifdef USE_MAD
sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kVorbisMode:
- #ifdef USE_VORBIS
+#ifdef USE_VORBIS
sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kFlacMode:
- #ifdef USE_FLAC
- sampleStream = Audio::makeFlacStream(compressedStream, DisposeAfterUse::YES);
- #endif
+#ifdef USE_FLAC
+ sampleStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES);
+#endif
break;
default:
sampleStream = Audio::makeRawStream(sampleBuf, sampleLen, 22050, Audio::FLAG_UNSIGNED);
@@ -288,19 +288,19 @@
switch (_soundMode) {
case kMP3Mode:
- #ifdef USE_MAD
+#ifdef USE_MAD
sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kVorbisMode:
- #ifdef USE_VORBIS
+#ifdef USE_VORBIS
sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
- #endif
+#endif
break;
case kFlacMode:
- #ifdef USE_FLAC
- sampleStream = Audio::makeFlacStream(compressedStream, DisposeAfterUse::YES);
- #endif
+#ifdef USE_FLAC
+ sampleStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES);
+#endif
break;
default:
sampleStream = Audio::makeADPCMStream(compressedStream, DisposeAfterUse::YES, sampleLen, Audio::kADPCMTinsel6, 22050, 1, 24);
Modified: scummvm/trunk/engines/touche/resource.cpp
===================================================================
--- scummvm/trunk/engines/touche/resource.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/touche/resource.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -53,7 +53,7 @@
static const CompressedSpeechFile compressedSpeechFilesTable[] = {
#ifdef USE_FLAC
- { "TOUCHE.SOF", Audio::makeFlacStream },
+ { "TOUCHE.SOF", Audio::makeFLACStream },
#endif
#ifdef USE_VORBIS
{ "TOUCHE.SOG", Audio::makeVorbisStream },
Modified: scummvm/trunk/engines/tucker/resource.cpp
===================================================================
--- scummvm/trunk/engines/tucker/resource.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/engines/tucker/resource.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -48,7 +48,7 @@
static const CompressedSoundFile compressedSoundFilesTable[] = {
#ifdef USE_FLAC
- { "TUCKER.SOF", Audio::makeFlacStream },
+ { "TUCKER.SOF", Audio::makeFLACStream },
#endif
#ifdef USE_VORBIS
{ "TUCKER.SOG", Audio::makeVorbisStream },
Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/sound/audiostream.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -53,8 +53,8 @@
static const StreamFileFormat STREAM_FILEFORMATS[] = {
/* decoderName, fileExt, openStreamFuntion */
#ifdef USE_FLAC
- { "Flac", ".flac", makeFlacStream },
- { "Flac", ".fla", makeFlacStream },
+ { "FLAC", ".flac", makeFLACStream },
+ { "FLAC", ".fla", makeFLACStream },
#endif
#ifdef USE_VORBIS
{ "Ogg Vorbis", ".ogg", makeVorbisStream },
Modified: scummvm/trunk/sound/decoders/flac.cpp
===================================================================
--- scummvm/trunk/sound/decoders/flac.cpp 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/sound/decoders/flac.cpp 2010-02-03 09:42:11 UTC (rev 47846)
@@ -82,7 +82,7 @@
static const uint MAX_OUTPUT_CHANNELS = 2;
-class FlacStream : public SeekableAudioStream {
+class FLACStream : public SeekableAudioStream {
protected:
Common::SeekableReadStream *_inStream;
bool _disposeAfterUse;
@@ -124,8 +124,8 @@
public:
- FlacStream(Common::SeekableReadStream *inStream, bool dispose);
- virtual ~FlacStream();
+ FLACStream(Common::SeekableReadStream *inStream, bool dispose);
+ virtual ~FLACStream();
int readBuffer(int16 *buffer, const int numSamples);
@@ -179,7 +179,7 @@
static void convertBuffersMono8Bit(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits);
};
-FlacStream::FlacStream(Common::SeekableReadStream *inStream, bool dispose)
+FLACStream::FLACStream(Common::SeekableReadStream *inStream, bool dispose)
#ifdef LEGACY_FLAC
: _decoder(::FLAC__seekable_stream_decoder_new()),
#else
@@ -189,7 +189,7 @@
_disposeAfterUse(dispose),
_length(0, 1000), _lastSample(0),
_outBuffer(NULL), _requestedSamples(0), _lastSampleWritten(false),
- _methodConvertBuffers(&FlacStream::convertBuffersGeneric)
+ _methodConvertBuffers(&FLACStream::convertBuffersGeneric)
{
assert(_inStream);
memset(&_streaminfo, 0, sizeof(_streaminfo));
@@ -197,32 +197,32 @@
_sampleCache.bufReadPos = NULL;
_sampleCache.bufFill = 0;
- _methodConvertBuffers = &FlacStream::convertBuffersGeneric;
+ _methodConvertBuffers = &FLACStream::convertBuffersGeneric;
bool success;
#ifdef LEGACY_FLAC
- ::FLAC__seekable_stream_decoder_set_read_callback(_decoder, &FlacStream::callWrapRead);
- ::FLAC__seekable_stream_decoder_set_seek_callback(_decoder, &FlacStream::callWrapSeek);
- ::FLAC__seekable_stream_decoder_set_tell_callback(_decoder, &FlacStream::callWrapTell);
- ::FLAC__seekable_stream_decoder_set_length_callback(_decoder, &FlacStream::callWrapLength);
- ::FLAC__seekable_stream_decoder_set_eof_callback(_decoder, &FlacStream::callWrapEOF);
- ::FLAC__seekable_stream_decoder_set_write_callback(_decoder, &FlacStream::callWrapWrite);
- ::FLAC__seekable_stream_decoder_set_metadata_callback(_decoder, &FlacStream::callWrapMetadata);
- ::FLAC__seekable_stream_decoder_set_error_callback(_decoder, &FlacStream::callWrapError);
+ ::FLAC__seekable_stream_decoder_set_read_callback(_decoder, &FLACStream::callWrapRead);
+ ::FLAC__seekable_stream_decoder_set_seek_callback(_decoder, &FLACStream::callWrapSeek);
+ ::FLAC__seekable_stream_decoder_set_tell_callback(_decoder, &FLACStream::callWrapTell);
+ ::FLAC__seekable_stream_decoder_set_length_callback(_decoder, &FLACStream::callWrapLength);
+ ::FLAC__seekable_stream_decoder_set_eof_callback(_decoder, &FLACStream::callWrapEOF);
+ ::FLAC__seekable_stream_decoder_set_write_callback(_decoder, &FLACStream::callWrapWrite);
+ ::FLAC__seekable_stream_decoder_set_metadata_callback(_decoder, &FLACStream::callWrapMetadata);
+ ::FLAC__seekable_stream_decoder_set_error_callback(_decoder, &FLACStream::callWrapError);
::FLAC__seekable_stream_decoder_set_client_data(_decoder, (void*)this);
success = (::FLAC__seekable_stream_decoder_init(_decoder) == FLAC__SEEKABLE_STREAM_DECODER_OK);
#else
success = (::FLAC__stream_decoder_init_stream(
_decoder,
- &FlacStream::callWrapRead,
- &FlacStream::callWrapSeek,
- &FlacStream::callWrapTell,
- &FlacStream::callWrapLength,
- &FlacStream::callWrapEOF,
- &FlacStream::callWrapWrite,
- &FlacStream::callWrapMetadata,
- &FlacStream::callWrapError,
+ &FLACStream::callWrapRead,
+ &FLACStream::callWrapSeek,
+ &FLACStream::callWrapTell,
+ &FLACStream::callWrapLength,
+ &FLACStream::callWrapEOF,
+ &FLACStream::callWrapWrite,
+ &FLACStream::callWrapMetadata,
+ &FLACStream::callWrapError,
(void*)this
) == FLAC__STREAM_DECODER_INIT_STATUS_OK);
#endif
@@ -234,10 +234,10 @@
}
}
- warning("FlacStream: could not create audio stream");
+ warning("FLACStream: could not create audio stream");
}
-FlacStream::~FlacStream() {
+FLACStream::~FLACStream() {
if (_decoder != NULL) {
#ifdef LEGACY_FLAC
(void) ::FLAC__seekable_stream_decoder_finish(_decoder);
@@ -251,7 +251,7 @@
delete _inStream;
}
-inline FLAC__StreamDecoderState FlacStream::getStreamDecoderState() const {
+inline FLAC__StreamDecoderState FLACStream::getStreamDecoderState() const {
assert(_decoder != NULL);
#ifdef LEGACY_FLAC
return ::FLAC__seekable_stream_decoder_get_stream_decoder_state(_decoder);
@@ -260,7 +260,7 @@
#endif
}
-inline bool FlacStream::processSingleBlock() {
+inline bool FLACStream::processSingleBlock() {
assert(_decoder != NULL);
#ifdef LEGACY_FLAC
return 0 != ::FLAC__seekable_stream_decoder_process_single(_decoder);
@@ -269,7 +269,7 @@
#endif
}
-inline bool FlacStream::processUntilEndOfMetadata() {
+inline bool FLACStream::processUntilEndOfMetadata() {
assert(_decoder != NULL);
#ifdef LEGACY_FLAC
return 0 != ::FLAC__seekable_stream_decoder_process_until_end_of_metadata(_decoder);
@@ -278,7 +278,7 @@
#endif
}
-bool FlacStream::seekAbsolute(FLAC__uint64 sample) {
+bool FLACStream::seekAbsolute(FLAC__uint64 sample) {
assert(_decoder != NULL);
#ifdef LEGACY_FLAC
const bool result = (0 != ::FLAC__seekable_stream_decoder_seek_absolute(_decoder, sample));
@@ -291,7 +291,7 @@
return result;
}
-bool FlacStream::seek(const Timestamp &where) {
+bool FLACStream::seek(const Timestamp &where) {
_sampleCache.bufFill = 0;
_sampleCache.bufReadPos = NULL;
// FLAC uses the sample pair number, thus we always use "false" for the isStereo parameter
@@ -299,11 +299,11 @@
return seekAbsolute((FLAC__uint64)convertTimeToStreamPos(where, getRate(), false).totalNumberOfFrames());
}
-int FlacStream::readBuffer(int16 *buffer, const int numSamples) {
+int FLACStream::readBuffer(int16 *buffer, const int numSamples) {
const uint numChannels = getChannels();
if (numChannels == 0) {
- warning("FlacStream: Stream not sucessfully initialised, cant playback");
+ warning("FLACStream: Stream not sucessfully initialised, cant playback");
return -1; // streaminfo wasnt read!
}
@@ -355,7 +355,7 @@
break;
default:
decoderOk = false;
- warning("FlacStream: An error occured while decoding. DecoderState is: %s",
+ warning("FLACStream: An error occured while decoding. DecoderState is: %s",
FLAC__StreamDecoderStateString[getStreamDecoderState()]);
}
@@ -369,7 +369,7 @@
return decoderOk ? samples : -1;
}
-inline ::FLAC__SeekableStreamDecoderReadStatus FlacStream::callbackRead(FLAC__byte buffer[], FLAC_size_t *bytes) {
+inline ::FLAC__SeekableStreamDecoderReadStatus FLACStream::callbackRead(FLAC__byte buffer[], FLAC_size_t *bytes) {
if (*bytes == 0) {
#ifdef LEGACY_FLAC
return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR; /* abort to avoid a deadlock */
@@ -396,8 +396,8 @@
#endif
}
-void FlacStream::setBestConvertBufferMethod() {
- PFCONVERTBUFFERS tempMethod = &FlacStream::convertBuffersGeneric;
+void FLACStream::setBestConvertBufferMethod() {
+ PFCONVERTBUFFERS tempMethod = &FLACStream::convertBuffersGeneric;
const uint numChannels = getChannels();
const uint8 numBits = (uint8)_streaminfo.bits_per_sample;
@@ -407,21 +407,21 @@
if (numChannels == 1) {
if (numBits == 8)
- tempMethod = &FlacStream::convertBuffersMono8Bit;
+ tempMethod = &FLACStream::convertBuffersMono8Bit;
if (numBits == BUFTYPE_BITS)
- tempMethod = &FlacStream::convertBuffersMonoNS;
+ tempMethod = &FLACStream::convertBuffersMonoNS;
} else if (numChannels == 2) {
if (numBits == 8)
- tempMethod = &FlacStream::convertBuffersStereo8Bit;
+ tempMethod = &FLACStream::convertBuffersStereo8Bit;
if (numBits == BUFTYPE_BITS)
- tempMethod = &FlacStream::convertBuffersStereoNS;
+ tempMethod = &FLACStream::convertBuffersStereoNS;
} /* else ... */
_methodConvertBuffers = tempMethod;
}
// 1 channel, no scaling
-void FlacStream::convertBuffersMonoNS(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits) {
+void FLACStream::convertBuffersMonoNS(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits) {
assert(numChannels == 1);
assert(numBits == BUFTYPE_BITS);
@@ -446,7 +446,7 @@
}
// 1 channel, scaling from 8Bit
-void FlacStream::convertBuffersMono8Bit(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits) {
+void FLACStream::convertBuffersMono8Bit(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits) {
assert(numChannels == 1);
assert(numBits == 8);
assert(8 < BUFTYPE_BITS);
@@ -472,7 +472,7 @@
}
// 2 channels, no scaling
-void FlacStream::convertBuffersStereoNS(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits) {
+void FLACStream::convertBuffersStereoNS(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits) {
assert(numChannels == 2);
assert(numBits == BUFTYPE_BITS);
assert(numSamples % 2 == 0); // must be integral multiply of channels
@@ -505,7 +505,7 @@
}
// 2 channels, scaling from 8Bit
-void FlacStream::convertBuffersStereo8Bit(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits) {
+void FLACStream::convertBuffersStereo8Bit(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits) {
assert(numChannels == 2);
assert(numBits == 8);
assert(numSamples % 2 == 0); // must be integral multiply of channels
@@ -538,7 +538,7 @@
}
// all Purpose-conversion - slowest of em all
-void FlacStream::convertBuffersGeneric(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits) {
+void FLACStream::convertBuffersGeneric(SampleType* bufDestination, const FLAC__int32 *inChannels[], uint numSamples, const uint numChannels, const uint8 numBits) {
assert(numSamples % numChannels == 0); // must be integral multiply of channels
if (numBits < BUFTYPE_BITS) {
@@ -565,7 +565,7 @@
assert(numSamples == 0); // dint copy too many samples
}
-inline ::FLAC__StreamDecoderWriteStatus FlacStream::callbackWrite(const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]) {
+inline ::FLAC__StreamDecoderWriteStatus FLACStream::callbackWrite(const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]) {
assert(frame->header.channels == _streaminfo.channels);
assert(frame->header.sample_rate == _streaminfo.sample_rate);
assert(frame->header.bits_per_sample == _streaminfo.bits_per_sample);
@@ -625,7 +625,7 @@
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
-inline ::FLAC__SeekableStreamDecoderSeekStatus FlacStream::callbackSeek(FLAC__uint64 absoluteByteOffset) {
+inline ::FLAC__SeekableStreamDecoderSeekStatus FLACStream::callbackSeek(FLAC__uint64 absoluteByteOffset) {
_inStream->seek(absoluteByteOffset, SEEK_SET);
const bool result = (absoluteByteOffset == (FLAC__uint64)_inStream->pos());
@@ -636,7 +636,7 @@
#endif
}
-inline ::FLAC__SeekableStreamDecoderTellStatus FlacStream::callbackTell(FLAC__uint64 *absoluteByteOffset) {
+inline ::FLAC__SeekableStreamDecoderTellStatus FLACStream::callbackTell(FLAC__uint64 *absoluteByteOffset) {
*absoluteByteOffset = static_cast<FLAC__uint64>(_inStream->pos());
#ifdef LEGACY_FLAC
return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
@@ -645,7 +645,7 @@
#endif
}
-inline ::FLAC__SeekableStreamDecoderLengthStatus FlacStream::callbackLength(FLAC__uint64 *streamLength) {
+inline ::FLAC__SeekableStreamDecoderLengthStatus FLACStream::callbackLength(FLAC__uint64 *streamLength) {
*streamLength = static_cast<FLAC__uint64>(_inStream->size());
#ifdef LEGACY_FLAC
return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
@@ -654,69 +654,69 @@
#endif
}
-inline bool FlacStream::callbackEOF() {
+inline bool FLACStream::callbackEOF() {
return _inStream->eos();
}
-inline void FlacStream::callbackMetadata(const ::FLAC__StreamMetadata *metadata) {
+inline void FLACStream::callbackMetadata(const ::FLAC__StreamMetadata *metadata) {
assert(_decoder != NULL);
assert(metadata->type == FLAC__METADATA_TYPE_STREAMINFO); // others arent really interesting
_streaminfo = metadata->data.stream_info;
setBestConvertBufferMethod(); // should be set after getting stream-information. FLAC always parses the info first
}
-inline void FlacStream::callbackError(::FLAC__StreamDecoderErrorStatus status) {
+inline void FLACStream::callbackError(::FLAC__StreamDecoderErrorStatus status) {
// some of these are non-critical-Errors
- debug(1, "FlacStream: An error occured while decoding. DecoderState is: %s",
+ debug(1, "FLACStream: An error occured while decoding. DecoderState is: %s",
FLAC__StreamDecoderErrorStatusString[status]);
}
/* Static Callback Wrappers */
-::FLAC__SeekableStreamDecoderReadStatus FlacStream::callWrapRead(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], FLAC_size_t *bytes, void *clientData) {
- FlacStream *instance = (FlacStream *)clientData;
+::FLAC__SeekableStreamDecoderReadStatus FLACStream::callWrapRead(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], FLAC_size_t *bytes, void *clientData) {
+ FLACStream *instance = (FLACStream *)clientData;
assert(0 != instance);
return instance->callbackRead(buffer, bytes);
}
-::FLAC__SeekableStreamDecoderSeekStatus FlacStream::callWrapSeek(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absoluteByteOffset, void *clientData) {
- FlacStream *instance = (FlacStream *)clientData;
+::FLAC__SeekableStreamDecoderSeekStatus FLACStream::callWrapSeek(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absoluteByteOffset, void *clientData) {
+ FLACStream *instance = (FLACStream *)clientData;
assert(0 != instance);
return instance->callbackSeek(absoluteByteOffset);
}
-::FLAC__SeekableStreamDecoderTellStatus FlacStream::callWrapTell(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absoluteByteOffset, void *clientData) {
- FlacStream *instance = (FlacStream *)clientData;
+::FLAC__SeekableStreamDecoderTellStatus FLACStream::callWrapTell(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absoluteByteOffset, void *clientData) {
+ FLACStream *instance = (FLACStream *)clientData;
assert(0 != instance);
return instance->callbackTell(absoluteByteOffset);
}
-::FLAC__SeekableStreamDecoderLengthStatus FlacStream::callWrapLength(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *streamLength, void *clientData) {
- FlacStream *instance = (FlacStream *)clientData;
+::FLAC__SeekableStreamDecoderLengthStatus FLACStream::callWrapLength(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *streamLength, void *clientData) {
+ FLACStream *instance = (FLACStream *)clientData;
assert(0 != instance);
return instance->callbackLength(streamLength);
}
-FLAC__bool FlacStream::callWrapEOF(const ::FLAC__SeekableStreamDecoder *decoder, void *clientData) {
- FlacStream *instance = (FlacStream *)clientData;
+FLAC__bool FLACStream::callWrapEOF(const ::FLAC__SeekableStreamDecoder *decoder, void *clientData) {
+ FLACStream *instance = (FLACStream *)clientData;
assert(0 != instance);
return instance->callbackEOF();
}
-::FLAC__StreamDecoderWriteStatus FlacStream::callWrapWrite(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *clientData) {
- FlacStream *instance = (FlacStream *)clientData;
+::FLAC__StreamDecoderWriteStatus FLACStream::callWrapWrite(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *clientData) {
+ FLACStream *instance = (FLACStream *)clientData;
assert(0 != instance);
return instance->callbackWrite(frame, buffer);
}
-void FlacStream::callWrapMetadata(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *clientData) {
- FlacStream *instance = (FlacStream *)clientData;
+void FLACStream::callWrapMetadata(const ::FLAC__SeekableStreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *clientData) {
+ FLACStream *instance = (FLACStream *)clientData;
assert(0 != instance);
instance->callbackMetadata(metadata);
}
-void FlacStream::callWrapError(const ::FLAC__SeekableStreamDecoder *decoder, ::FLAC__StreamDecoderErrorStatus status, void *clientData) {
- FlacStream *instance = (FlacStream *)clientData;
+void FLACStream::callWrapError(const ::FLAC__SeekableStreamDecoder *decoder, ::FLAC__StreamDecoderErrorStatus status, void *clientData) {
+ FLACStream *instance = (FLACStream *)clientData;
assert(0 != instance);
instance->callbackError(status);
}
@@ -726,10 +726,10 @@
#pragma mark --- Flac factory functions ---
#pragma mark -
-SeekableAudioStream *makeFlacStream(
+SeekableAudioStream *makeFLACStream(
Common::SeekableReadStream *stream,
DisposeAfterUse::Flag disposeAfterUse) {
- SeekableAudioStream *s = new FlacStream(stream, disposeAfterUse);
+ SeekableAudioStream *s = new FLACStream(stream, disposeAfterUse);
if (s && s->endOfData()) {
delete s;
return 0;
Modified: scummvm/trunk/sound/decoders/flac.h
===================================================================
--- scummvm/trunk/sound/decoders/flac.h 2010-02-03 09:32:16 UTC (rev 47845)
+++ scummvm/trunk/sound/decoders/flac.h 2010-02-03 09:42:11 UTC (rev 47846)
@@ -59,11 +59,11 @@
* Create a new SeekableAudioStream from the FLAC data in the given stream.
* Allows for seeking (which is why we require a SeekableReadStream).
*
- * @param stream the SeekableReadStream from which to read the FLAC data
- * @param disposeAfterUse whether to delete the stream after use
- * @return a new SeekableAudioStream, or NULL, if an error occured
+ * @param stream the SeekableReadStream from which to read the FLAC data
+ * @param disposeAfterUse whether to delete the stream after use
+ * @return a new SeekableAudioStream, or NULL, if an error occured
*/
-SeekableAudioStream *makeFlacStream(
+SeekableAudioStream *makeFLACStream(
Common::SeekableReadStream *stream,
DisposeAfterUse::Flag disposeAfterUse);
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