From f24cc1c8be08448c8412afef29be3ffa4ff09dd5 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 8 Mar 2010 10:27:42 +0000 Subject: 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 --- engines/touche/resource.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/touche') 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; -- cgit v1.2.3