[Scummvm-cvs-logs] SF.net SVN: scummvm: [31506] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31506
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31506&view=rev
Author:   lordhoto
Date:     2008-04-14 13:57:24 -0700 (Mon, 14 Apr 2008)

Log Message:
-----------
Fixed music fade out.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v3.cpp
    scummvm/trunk/engines/kyra/sound_digital.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-14 20:42:09 UTC (rev 31505)
+++ scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-14 20:57:24 UTC (rev 31506)
@@ -332,7 +332,6 @@
 	if (!lock) {
 		lock = 1;
 		if (_musicSoundChannel >= 0) {
-			_soundDigital->stopAllSounds();
 			if (!_soundDigital->isPlaying(_musicSoundChannel)) {
 				if (_curMusicTrack != -1)
 					playMusicTrack(_curMusicTrack, 1);

Modified: scummvm/trunk/engines/kyra/sound_digital.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_digital.cpp	2008-04-14 20:42:09 UTC (rev 31505)
+++ scummvm/trunk/engines/kyra/sound_digital.cpp	2008-04-14 20:57:24 UTC (rev 31506)
@@ -311,7 +311,7 @@
 	}
 
 	if (_fading < 0 && _fadeCount == 0)
-		_fading = false;
+		_fading = 0;
 
 	return samplesProcessed;
 }


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