diff options
| author | Max Horn | 2010-03-08 10:27:42 +0000 |
|---|---|---|
| committer | Max Horn | 2010-03-08 10:27:42 +0000 |
| commit | f24cc1c8be08448c8412afef29be3ffa4ff09dd5 (patch) | |
| tree | 28c0d14608cae4af3685afb41da2e7651b77a20e /engines | |
| parent | 50116130efedc66ec8261df6080fb7ca6fe079f7 (diff) | |
| download | scummvm-rg350-f24cc1c8be08448c8412afef29be3ffa4ff09dd5.tar.gz scummvm-rg350-f24cc1c8be08448c8412afef29be3ffa4ff09dd5.tar.bz2 scummvm-rg350-f24cc1c8be08448c8412afef29be3ffa4ff09dd5.zip | |
Tweak makeVOCDiskStream
* now takes a SeekableReadStream *pointer* like (almost) all other
audiostream factories
* fix potential memory leak in it
* rename takeOwnershipOfStream to disposeAfterUse for consistency
svn-id: r48184
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/agos/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/sound.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/touche/resource.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index 06ba6246e5..84b0eebe69 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -260,7 +260,7 @@ public: Audio::AudioStream *VocSound::makeAudioStream(uint sound) { assert(_offsets); _file->seek(_offsets[sound], SEEK_SET); - return Audio::makeVOCStream(*_file, _flags); + return Audio::makeVOCStream(_file, _flags); } void VocSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) { diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 9b049eb2d6..f25a4833a2 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -245,9 +245,9 @@ namespace { Audio::SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse) { #ifdef STREAM_AUDIO_FROM_DISK - Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::FLAG_UNSIGNED, disposeAfterUse); + Audio::SeekableAudioStream *as = Audio::makeVOCStream(stream, Audio::FLAG_UNSIGNED, disposeAfterUse); #else - Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO); + Audio::SeekableAudioStream *as = Audio::makeVOCStream(stream, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO); if (disposeAfterUse) delete stream; diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 19be224356..22e56ede3b 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -662,7 +662,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle #endif break; default: - input = Audio::makeVOCStream(*_sfxFile, Audio::FLAG_UNSIGNED); + input = Audio::makeVOCStream(_sfxFile, Audio::FLAG_UNSIGNED); break; } diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp index dead9ae4c7..6e0b0220b7 100644 --- a/engines/touche/resource.cpp +++ b/engines/touche/resource.cpp @@ -588,7 +588,7 @@ void ToucheEngine::res_loadSound(int priority, int num) { uint32 size; const uint32 offs = res_getDataOffset(kResourceTypeSound, num, &size); _fData.seek(offs); - Audio::AudioStream *stream = Audio::makeVOCStream(_fData, Audio::FLAG_UNSIGNED); + Audio::AudioStream *stream = Audio::makeVOCStream(&_fData, Audio::FLAG_UNSIGNED); if (stream) { _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, stream); } @@ -646,7 +646,7 @@ void ToucheEngine::res_loadSpeechSegment(int num) { return; } _fSpeech[i].seek(offs); - stream = Audio::makeVOCStream(_fSpeech[i], Audio::FLAG_UNSIGNED); + stream = Audio::makeVOCStream(&_fSpeech[i], Audio::FLAG_UNSIGNED); } else { if (num >= 750) { num -= 750; |