libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: fix regression of r49109 - only queue up midi sounds

Browse Source 
svn-id: r49114
This commit is contained in:
Martin Kiewitz 2010-05-20 06:11:46 +00:00
parent a0db16294a
commit 5f8778395a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,7 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
for (uint i = 0; i < playListCount; i++) {
if (_playList[i] == pSnd)
playListNo = i;
if (_playList[i]->status == kSoundPlaying)
if ((_playList[i]->status == kSoundPlaying) && (_playList[i]->pMidiParser))
alreadyPlaying = true;
}
if (playListNo == playListCount) { // not found
@ -259,14 +259,16 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
_mutex.unlock(); // unlock to perform mixer-related calls
if ((_soundVersion <= SCI_VERSION_0_LATE) && (alreadyPlaying)) {
// if any music is already playing, SCI0 queues music and plays it after the current music has finished
// done by SoundCommandParser::updateSci0Cues()
// Example of such case: iceman room 14
// FIXME: this code is supposed to also take a look at priority and pause currently playing sound accordingly
pSnd->isQueued = true;
pSnd->status = kSoundPaused;
return;
if (pSnd->pMidiParser) {
if ((_soundVersion <= SCI_VERSION_0_LATE) && (alreadyPlaying)) {
// if any music is already playing, SCI0 queues music and plays it after the current music has finished
// done by SoundCommandParser::updateSci0Cues()
// Example of such case: iceman room 14
// FIXME: this code is supposed to also take a look at priority and pause currently playing sound accordingly
pSnd->isQueued = true;
pSnd->status = kSoundPaused;
return;
}
}
if (pSnd->pStreamAud && !_pMixer->isSoundHandleActive(pSnd->hCurrentAud)) {