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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Thu May 27 22:53:37 CEST 2010


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

Log Message:
-----------
SCI: enabling fading again, issues in pharkas and gk1demo are actually "normal" - maybe we should add some hack workaround, but the delay in ssci was just slow resource loading

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:29:39 UTC (rev 49268)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-05-27 20:53:37 UTC (rev 49269)
@@ -37,9 +37,6 @@
 
 namespace Sci {
 
-// When defined, volume fading immediately sets the final sound volume
-#define DISABLE_VOLUME_FADING
-
 SciMusic::SciMusic(SciVersion soundVersion)
 	: _soundVersion(soundVersion), _soundOn(true), _masterVolume(0) {
 
@@ -537,12 +534,6 @@
 
 		// Only process MIDI streams in this thread, not digital sound effects
 		if (pMidiParser) {
-#ifdef DISABLE_VOLUME_FADING
-			// Signal fading to stop...
-			volume = fadeTo;
-			fadeStep = 0;
-			fadeCompleted = true;
-#endif
 			pMidiParser->setVolume(volume);
 		}
 


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




More information about the Scummvm-git-logs mailing list