[Scummvm-cvs-logs] SF.net SVN: scummvm:[47870] scummvm/trunk/engines/sci/sound/music.cpp

[thebluegr at users.sourceforge.net]

Revision: 47870
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47870&view=rev
Author:   thebluegr
Date:     2010-02-03 23:02:37 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
Fixed the hang with the new music code after the copy protection in Island of Dr. Brain

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/music.cpp

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-02-03 22:20:33 UTC (rev 47869)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-02-03 23:02:37 UTC (rev 47870)
@@ -499,12 +499,16 @@
 		}
 
 		// Only process MIDI streams in this thread, not digital sound effects
-		if (pMidiParser)
-#ifndef DISABLE_VOLUME_FADING
+		if (pMidiParser) {
+#ifdef DISABLE_VOLUME_FADING
+			// Signal fading to stop...
+			volume = fadeTo;
+			fadeStep = 0;
+			fadeCompleted = true;
+#endif
 			pMidiParser->setVolume(volume);
-#else
-			pMidiParser->setVolume(fadeTo);
-#endif
+		}
+
 		fadeSetVolume = true; // set flag so that SoundCommandParser::cmdUpdateCues will set the volume of the stream
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.