ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCI: Fixed bug #3266480 and partially fixed bug #3041738

Browse Source 
Hopefully, this will fix some of the oddities happening because of music fading
This commit is contained in:
md5
2011-04-03 14:37:15 +03:00
parent 51f733b2a6
commit 9654068659
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/sci/sound/music.cpp
+19
View File
@@ -442,6 +442,25 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
if (pSnd->pMidiParser) {
Common::StackLock lock(_mutex);
pSnd->pMidiParser->mainThreadBegin();
if (pSnd->status != kSoundPaused) {
// Stop any in progress music fading, as that will reset the
// volume of the sound channels that the faded song occupies..
// Fixes bug #3266480 and partially fixes bug #3041738.
for (uint i = 0; i < playListCount; i++) {
// Is another MIDI song being faded? If yes, stop it
// immediately instead
if (_playList[i]->fadeStep && _playList[i]->pMidiParser) {
_playList[i]->status = kSoundStopped;
if (_soundVersion <= SCI_VERSION_0_LATE)
_playList[i]->isQueued = false;
_playList[i]->pMidiParser->stop();
freeChannels(_playList[i]);
_playList[i]->fadeStep = 0;
}
}
}
pSnd->pMidiParser->tryToOwnChannels();
if (pSnd->status != kSoundPaused)
pSnd->pMidiParser->sendInitCommands();