[Scummvm-cvs-logs] SF.net SVN: scummvm:[42601] scummvm/branches/gsoc2009-mods

[nolange at users.sourceforge.net]

Revision: 42601
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42601&view=rev
Author:   nolange
Date:     2009-07-19 00:58:01 +0000 (Sun, 19 Jul 2009)

Log Message:
-----------
add support for fadeout

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
    scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp

Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-07-19 00:44:54 UTC (rev 42600)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-07-19 00:58:01 UTC (rev 42601)
@@ -128,12 +128,17 @@
 }
 
 void SoundAmiga::haltTrack() {
-
-
 }
 
 void SoundAmiga::beginFadeOut() {
+	for (int i = 0x3F; i >= 0; --i) {
+		_driver->setVolume((byte)i);
+		_vm->delay(1000 / 50);
+	}
 
+	_driver->stopMusic();
+	_vm->delay(1000 / 50);
+	_driver->setVolume(0x40);
 }
 
 void SoundAmiga::playSoundEffect(uint8 track) {

Modified: scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp	2009-07-19 00:44:54 UTC (rev 42600)
+++ scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp	2009-07-19 00:58:01 UTC (rev 42601)
@@ -90,8 +90,8 @@
 			const uint16 stopTime = curEvent->stopTime;
 			ChannelContext &channel = _channelCtx[data & 0x0F];
 
-			outPutEvent(*curEvent);
-			debug("CurTime, EventDelta, NextDelta: %d, %d, %d", millis, eventDelta, eventDelta + curEvent[1].startTime );
+			// outPutEvent(*curEvent);
+			// debug("CurTime, EventDelta, NextDelta: %d, %d, %d", millis, eventDelta, eventDelta + curEvent[1].startTime );
 
 			if (cmd < 0x80) {	// Note
 				const uint16 vol = (data & 0xF0) >> 1;


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