From 21e1cc4cf8b79a9f59e911514c52831113356f7c Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 31 Jan 2010 02:11:41 +0000 Subject: [PATCH] Switch makeADPCMStream to DisposeAfterUse::Flag svn-id: r47736 --- engines/mohawk/sound.cpp | 2 +- engines/mohawk/video/qt_player.cpp | 2 +- engines/saga/sndres.cpp | 2 +- engines/scumm/he/sound_he.cpp | 2 +- engines/tinsel/music.cpp | 2 +- sound/decoders/adpcm.cpp | 10 +++++----- sound/decoders/adpcm.h | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index 177ba18b3bb..4d0a26847a5 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -465,7 +465,7 @@ Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stre } else if (data_chunk.encoding == kCodecADPCM) { Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, DisposeAfterUse::YES); uint32 blockAlign = data_chunk.channels * data_chunk.bitsPerSample / 8; - return Audio::makeADPCMStream(dataStream, true, data_chunk.size, Audio::kADPCMIma, data_chunk.sample_rate, data_chunk.channels, blockAlign); + return Audio::makeADPCMStream(dataStream, DisposeAfterUse::YES, data_chunk.size, Audio::kADPCMIma, data_chunk.sample_rate, data_chunk.channels, blockAlign); } else if (data_chunk.encoding == kCodecMPEG2) { #ifdef USE_MAD Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, DisposeAfterUse::YES); diff --git a/engines/mohawk/video/qt_player.cpp b/engines/mohawk/video/qt_player.cpp index 104e35db8ca..6f868a54184 100644 --- a/engines/mohawk/video/qt_player.cpp +++ b/engines/mohawk/video/qt_player.cpp @@ -1173,7 +1173,7 @@ Audio::AudioStream *QTPlayer::createAudioStream(Common::SeekableReadStream *stre return Audio::makeRawStream(data, dataSize, _streams[_audioStreamIndex]->sample_rate, flags); } else if (_streams[_audioStreamIndex]->codec_tag == MKID_BE('ima4')) { // Riven uses this codec (as do some Myst ME videos) - return Audio::makeADPCMStream(stream, true, stream->size(), Audio::kADPCMApple, _streams[_audioStreamIndex]->sample_rate, _streams[_audioStreamIndex]->channels, 34); + return Audio::makeADPCMStream(stream, DisposeAfterUse::YES, stream->size(), Audio::kADPCMApple, _streams[_audioStreamIndex]->sample_rate, _streams[_audioStreamIndex]->channels, 34); } else if (_streams[_audioStreamIndex]->codec_tag == MKID_BE('QDM2')) { // Several Myst ME videos use this codec return new QDM2Stream(stream, _streams[_audioStreamIndex]->extradata); diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp index be653129635..4532e2d23a2 100644 --- a/engines/saga/sndres.cpp +++ b/engines/saga/sndres.cpp @@ -306,7 +306,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff case kSoundVOX: buffer.size = soundResourceLength * 4; if (!onlyHeader) { - voxStream = Audio::makeADPCMStream(&readS, false, soundResourceLength, Audio::kADPCMOki); + voxStream = Audio::makeADPCMStream(&readS, DisposeAfterUse::NO, soundResourceLength, Audio::kADPCMOki); buffer.buffer = (byte *)malloc(buffer.size); voxStream->readBuffer((int16*)buffer.buffer, soundResourceLength * 2); delete voxStream; diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index d8924999a11..97c192cec56 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -643,7 +643,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) _mixer->stopHandle(_heSoundChannels[heChannel]); if (compType == 17) { - Audio::AudioStream *voxStream = Audio::makeADPCMStream(&memStream, false, size, Audio::kADPCMMSIma, rate, (flags & Audio::FLAG_STEREO) ? 2 : 1, blockAlign); + Audio::AudioStream *voxStream = Audio::makeADPCMStream(&memStream, DisposeAfterUse::NO, size, Audio::kADPCMMSIma, rate, (flags & Audio::FLAG_STEREO) ? 2 : 1, blockAlign); // FIXME: Get rid of this crude hack to turn a ADPCM stream into a raw stream. // It seems it is only there to allow looping -- if that is true, we certainly diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index f30eabe2675..77630589636 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -877,7 +877,7 @@ bool PCMMusicPlayer::getNextChunk() { sampleStream = new Common::MemoryReadStream(buffer, sampleCLength, DisposeAfterUse::YES); delete _curChunk; - _curChunk = makeADPCMStream(sampleStream, true, sampleCLength, + _curChunk = makeADPCMStream(sampleStream, DisposeAfterUse::YES, sampleCLength, Audio::kADPCMTinsel8, 22050, 1, 32); _state = S_MID; diff --git a/sound/decoders/adpcm.cpp b/sound/decoders/adpcm.cpp index 7a15f118b34..4566dd78bd2 100644 --- a/sound/decoders/adpcm.cpp +++ b/sound/decoders/adpcm.cpp @@ -34,7 +34,7 @@ namespace Audio { class ADPCMInputStream : public RewindableAudioStream { private: Common::SeekableReadStream *_stream; - bool _disposeAfterUse; + DisposeAfterUse::Flag _disposeAfterUse; int32 _startpos; int32 _endpos; int _channels; @@ -82,7 +82,7 @@ private: int16 decodeTinsel(int16, double); public: - ADPCMInputStream(Common::SeekableReadStream *stream, bool disposeAfterUse, uint32 size, typesADPCM type, int rate, int channels, uint32 blockAlign); + ADPCMInputStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, typesADPCM type, int rate, int channels, uint32 blockAlign); ~ADPCMInputStream(); int readBuffer(int16 *buffer, const int numSamples); @@ -114,7 +114,7 @@ public: // In addition, also MS IMA ADPCM is supported. See // . -ADPCMInputStream::ADPCMInputStream(Common::SeekableReadStream *stream, bool disposeAfterUse, uint32 size, typesADPCM type, int rate, int channels, uint32 blockAlign) +ADPCMInputStream::ADPCMInputStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, typesADPCM type, int rate, int channels, uint32 blockAlign) : _stream(stream), _disposeAfterUse(disposeAfterUse), _channels(channels), _type(type), _blockAlign(blockAlign), _rate(rate) { if (type == kADPCMMSIma && blockAlign == 0) @@ -142,7 +142,7 @@ ADPCMInputStream::ADPCMInputStream(Common::SeekableReadStream *stream, bool disp } ADPCMInputStream::~ADPCMInputStream() { - if (_disposeAfterUse) + if (_disposeAfterUse == DisposeAfterUse::YES) delete _stream; } @@ -626,7 +626,7 @@ int16 ADPCMInputStream::decodeTinsel(int16 code, double eVal) { return (int16) CLIP(sample, -32768.0, 32767.0); } -RewindableAudioStream *makeADPCMStream(Common::SeekableReadStream *stream, bool disposeAfterUse, uint32 size, typesADPCM type, int rate, int channels, uint32 blockAlign) { +RewindableAudioStream *makeADPCMStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, typesADPCM type, int rate, int channels, uint32 blockAlign) { return new ADPCMInputStream(stream, disposeAfterUse, size, type, rate, channels, blockAlign); } diff --git a/sound/decoders/adpcm.h b/sound/decoders/adpcm.h index 46ccb582c32..7452478f35f 100644 --- a/sound/decoders/adpcm.h +++ b/sound/decoders/adpcm.h @@ -75,7 +75,7 @@ enum typesADPCM { */ RewindableAudioStream *makeADPCMStream( Common::SeekableReadStream *stream, - bool disposeAfterUse, + DisposeAfterUse::Flag disposeAfterUse, uint32 size, typesADPCM type, int rate = 22050, int channels = 2,