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

[m_kiewitz at users.sourceforge.net]

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

Log Message:
-----------
SCI: fix build

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:44:50 UTC (rev 46853)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2010-01-01 21:55:51 UTC (rev 46854)
@@ -572,8 +572,6 @@
 		// 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:44:50 UTC (rev 46853)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-01 21:55:51 UTC (rev 46854)
@@ -775,6 +775,7 @@
 	Audio::Mixer *mixer = g_system->getMixer();
 
 	if (musicSlot->pStreamAud) {
+		
 		// TODO: We need to update loop selector here, when sample is looping
 		if (!mixer->isSoundHandleActive(musicSlot->hCurrentAud)) {
 			musicSlot->ticker = SIGNAL_OFFSET;
@@ -783,6 +784,8 @@
 		} else {
 			musicSlot->ticker = (uint16)(mixer->getSoundElapsedTime(musicSlot->hCurrentAud) * 0.06);
 		}
+		if (musicSlot->fadeStep)
+				mixer->setChannelVolume(musicSlot->hCurrentAud, musicSlot->volume);
 	}
 
 	_music->_mutex.lock();	// and lock again


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