[Scummvm-cvs-logs] SF.net SVN: scummvm:[48152] scummvm/trunk/engines/sky/intro.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun Feb 28 09:32:45 CET 2010


Revision: 48152
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48152&view=rev
Author:   eriktorbjorn
Date:     2010-02-28 08:32:45 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
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".

Modified Paths:
--------------
    scummvm/trunk/engines/sky/intro.cpp

Modified: scummvm/trunk/engines/sky/intro.cpp
===================================================================
--- scummvm/trunk/engines/sky/intro.cpp	2010-02-28 01:35:34 UTC (rev 48151)
+++ scummvm/trunk/engines/sky/intro.cpp	2010-02-28 08:32:45 UTC (rev 48152)
@@ -755,12 +755,12 @@
 		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:


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