From 0dfd742b2183e195b80ec5085ed42fee17a283ee Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 22 Sep 2013 21:18:58 +0200
Subject: SCI: Remove no longer necessary hack

---
 engines/sci/sound/music.cpp | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'engines/sci')

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);
-- 
cgit v1.2.3