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

[nolange at users.sourceforge.net]

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

Log Message:
-----------
now using tick for fadeout through the nowmal delay function

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
    scummvm/branches/gsoc2009-mods/tfmx/mxtxplayer.cpp

Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-07-19 16:59:39 UTC (rev 42621)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-07-19 19:56:52 UTC (rev 42622)
@@ -132,12 +132,11 @@
 void SoundAmiga::beginFadeOut() {
 	for (int i = 0x3F; i >= 0; --i) {
 		_driver->setVolume((byte)i);
-		// TODO: use _tickLength or delayWithTicks but thats bugged
-		_vm->delay(1000 / 60);
+		_vm->delay(_vm->tickLength());
 	}
 
 	_driver->stopMusic();
-	_vm->delay(1000 / 60);
+	_vm->delay(_vm->tickLength());
 	_driver->setVolume(0x40);
 }
 

Modified: scummvm/branches/gsoc2009-mods/tfmx/mxtxplayer.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/tfmx/mxtxplayer.cpp	2009-07-19 16:59:39 UTC (rev 42621)
+++ scummvm/branches/gsoc2009-mods/tfmx/mxtxplayer.cpp	2009-07-19 19:56:52 UTC (rev 42622)
@@ -89,7 +89,7 @@
 
 	if (!hasCmd) {
 		player->playSong(0);
-		player->playNote(0x18, 0x03, 0x0F52, 120,  1);
+		//player->playNote(0x18, 0x03, 0x0F52, 120,  1);
 	}
 
 	int maxsecs = 10 * 60;


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