[Scummvm-cvs-logs] SF.net SVN: scummvm:[46853] scummvm/trunk/engines/sci/sfx

[m_kiewitz at users.sourceforge.net]

Revision: 46853
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46853&view=rev
Author:   m_kiewitz
Date:     2010-01-01 21:44:50 +0000 (Fri, 01 Jan 2010)

Log Message:
-----------
SCI/newmusic: changed fade volume setting for digital fx to onTimer() again, because setting it in updateCues() wont work right. We are processing fading effectively in there any way, added TODO for working approach

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

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2010-01-01 21:26:46 UTC (rev 46852)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2010-01-01 21:44:50 UTC (rev 46853)
@@ -569,6 +569,11 @@
 		// Only process MIDI streams in this thread, not digital sound effects
 		if (pMidiParser)
 			pMidiParser->setVolume(volume);
+		// TODO: create onTimer within audio.cpp to do the handling there, if we do it in cmdUpdateCues it wont
+		//  work right, because the last volume set won't get done at all. Also we are fading digital sound effects
+		//  currently here in any case currently. Fade code should get moved to void SciMusic::onTimer()
+		if (hCurrentAud)
+			mixer->setChannelVolume(musicSlot->hCurrentAud, volume);
 	}
 }
 

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-01 21:26:46 UTC (rev 46852)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-01 21:44:50 UTC (rev 46853)
@@ -782,10 +782,6 @@
 			musicSlot->status = kSoundStopped;
 		} else {
 			musicSlot->ticker = (uint16)(mixer->getSoundElapsedTime(musicSlot->hCurrentAud) * 0.06);
-
-			// Handle fading
-			if (musicSlot->fadeStep)
-				mixer->setChannelVolume(musicSlot->hCurrentAud, musicSlot->volume);
 		}
 	}
 


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