diff options
author | Willem Jan Palenstijn | 2013-09-22 21:18:58 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2013-12-31 13:52:37 +0100 |
commit | 0dfd742b2183e195b80ec5085ed42fee17a283ee (patch) | |
tree | 029d2a6557579390cf900e7147d60880d3572ba2 | |
parent | 857d2e7beff46fcd5d26e8590c9891a4959b8d1f (diff) | |
download | scummvm-rg350-0dfd742b2183e195b80ec5085ed42fee17a283ee.tar.gz scummvm-rg350-0dfd742b2183e195b80ec5085ed42fee17a283ee.tar.bz2 scummvm-rg350-0dfd742b2183e195b80ec5085ed42fee17a283ee.zip |
SCI: Remove no longer necessary hack
-rw-r--r-- | engines/sci/sound/music.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index e29afe706b..1b8aa55460 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -455,27 +455,6 @@ void SciMusic::soundPlay(MusicEntry *pSnd) { 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. - // CHECKME: Is this the right thing to do? Are these - // overlapping channels not a deeper underlying problem? - for (uint i = 0; i < playListCount; i++) { - // Is another MIDI song being faded down? If yes, stop it - // immediately instead - if (_playList[i]->fadeStep < 0 && _playList[i]->pMidiParser) { - _playList[i]->status = kSoundStopped; - if (_soundVersion <= SCI_VERSION_0_LATE) - _playList[i]->isQueued = false; - _playList[i]->pMidiParser->stop(); - remapChannels(); - _playList[i]->fadeStep = 0; - _playList[i]->fadeCompleted = true; - } - } - } - if (pSnd->status != kSoundPaused) pSnd->pMidiParser->sendInitCommands(); pSnd->pMidiParser->setVolume(pSnd->volume); |