libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-25 03:07:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: dont seek during init of music but on play, fixes assert when restoring saves caused by r49905 - because channel remapping isn't done at that point

Browse Source 
svn-id: r49907
This commit is contained in:
Martin Kiewitz 2010-06-16 21:23:47 +00:00
parent 02c3397ddf
commit 289b668099
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/sci/sound/music.cpp
View File

@ -224,8 +224,6 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
channelFilterMask = pSnd->soundRes->getChannelFilterMask(_pMidiDrv->getPlayId(), _pMidiDrv->hasRhythmChannel()); channelFilterMask = pSnd->soundRes->getChannelFilterMask(_pMidiDrv->getPlayId(), _pMidiDrv->hasRhythmChannel());
pSnd->pMidiParser->loadMusic(track, pSnd, channelFilterMask, _soundVersion); pSnd->pMidiParser->loadMusic(track, pSnd, channelFilterMask, _soundVersion);
// Fast forward to the last position and perform associated events when loading
pSnd->pMidiParser->jumpToTick(pSnd->ticker, true);
_mutex.unlock(); _mutex.unlock();
} }
} }
@ -316,6 +314,9 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
pSnd->pMidiParser->setVolume(pSnd->volume); pSnd->pMidiParser->setVolume(pSnd->volume);
if (pSnd->status == kSoundStopped) if (pSnd->status == kSoundStopped)
pSnd->pMidiParser->jumpToTick(0); pSnd->pMidiParser->jumpToTick(0);
else
// Fast forward to the last position and perform associated events when loading
pSnd->pMidiParser->jumpToTick(pSnd->ticker, true);
} }
_mutex.unlock(); _mutex.unlock();
} }