libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrote playMovieSound() to keep it from hogging memory in the resource

Browse Source 
manager. Perhaps this will finally fix the mysterious bug #2976008 ("BS2: Game
lockup in British Museum").

svn-id: r49036
This commit is contained in:
Torbjörn Andersson 2010-05-15 08:38:19 +00:00
parent 86bfccb842
commit 2da9fa5a6e
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
engines/sword2/sound.cpp
View File

@ -217,13 +217,38 @@ void Sound::playMovieSound(int32 res, int type) {
assert(_vm->_resman->fetchType(data) == WAV_FILE);
// In PSX version we have nothing to skip here, as data starts right away
if (!Sword2Engine::isPsx()) {
data += ResHeader::size();
len -= ResHeader::size();
// We want to close the resource right away, so to be safe we make a
// private copy of the sound;
byte *soundData = (byte *)malloc(len);
if (soundData) {
memcpy(soundData, data, len);
Common::MemoryReadStream *stream = new Common::MemoryReadStream(soundData, len, DisposeAfterUse::YES);
// In PSX version we have nothing to skip here, as data starts
// right away.
if (!Sword2Engine::isPsx()) {
stream->seek(ResHeader::size());
}
Audio::RewindableAudioStream *input = 0;
if (Sword2Engine::isPsx()) {
input = Audio::makeVagStream(stream);
} else {
input = Audio::makeWAVStream(stream, DisposeAfterUse::YES);
}
_vm->_mixer->playStream(
Audio::Mixer::kMusicSoundType, handle, input,
-1, Audio::Mixer::kMaxChannelVolume, 0,
DisposeAfterUse::YES, false, isReverseStereo());
} else {
warning("Sound::playMovieSound: Could not allocate %d bytes\n", len);
}
_vm->_sound->playFx(handle, data, len, Audio::Mixer::kMaxChannelVolume, 0, false, Audio::Mixer::kMusicSoundType);
_vm->_resman->closeResource(res);
}
void Sound::stopMovieSounds() {