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

[m_kiewitz at users.sourceforge.net]

Revision: 49271
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49271&view=rev
Author:   m_kiewitz
Date:     2010-05-27 21:20:07 +0000 (Thu, 27 May 2010)

Log Message:
-----------
SCI: disabling music fading again, but only for sci32 - drivers seem to have issues when fading in on gk1/sierra logo

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-05-27 20:59:15 UTC (rev 49270)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-05-27 21:20:07 UTC (rev 49271)
@@ -531,6 +531,14 @@
 			fadeStep = 0;
 			fadeCompleted = true;
 		}
+#ifdef ENABLE_SCI32
+		// Disable fading for SCI32 - sound drivers have issues when fading in (gabriel knight 1 sierra title)
+		if (getSciVersion() >= SCI_VERSION_2) {
+			volume = fadeTo;
+			fadeStep = 0;
+			fadeCompleted = true;
+		}
+#endif
 
 		// Only process MIDI streams in this thread, not digital sound effects
 		if (pMidiParser) {


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