aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2010-02-28 08:32:45 +0000
committerTorbjörn Andersson2010-02-28 08:32:45 +0000
commit3150006528ed68f12387c015cf413b0e9a30d3f0 (patch)
treef7d3ff8755fe080f23c5e44252f2e311a4386619
parent576f0b9a66d267e5068c00a955a14f736be95992 (diff)
downloadscummvm-rg350-3150006528ed68f12387c015cf413b0e9a30d3f0.tar.gz
scummvm-rg350-3150006528ed68f12387c015cf413b0e9a30d3f0.tar.bz2
scummvm-rg350-3150006528ed68f12387c015cf413b0e9a30d3f0.zip
Don't try to dispose of "_bgBuf + 256" automatically when playing the BASS
intro sound effects. The engine manages that memory on its own. This should fix bug #2960522, "BASS: Crash During the Intro". svn-id: r48152
-rw-r--r--engines/sky/intro.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index c926aa30e6..5114162a61 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -755,12 +755,12 @@ bool Intro::nextPart(uint16 *&data) {
return true;
case LOOPBG:
_mixer->stopID(SOUND_BG);
- stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED);
+ stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSfx, Audio::makeLoopingAudioStream(stream, 0), SOUND_BG);
return true;
case PLAYBG:
_mixer->stopID(SOUND_BG);
- stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED);
+ stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSfx, stream, SOUND_BG);
return true;
case STOPBG: