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

nolange at users.sourceforge.net nolange at users.sourceforge.net
Sun Jul 19 17:36:11 CEST 2009


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

Log Message:
-----------
use ticks for timing fadeout

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

Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-07-19 15:00:39 UTC (rev 42617)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-07-19 15:36:11 UTC (rev 42618)
@@ -131,11 +131,11 @@
 void SoundAmiga::beginFadeOut() {
 	for (int i = 0x3F; i >= 0; --i) {
 		_driver->setVolume((byte)i);
-		_vm->delay(1000 / 50);
+		_vm->delayWithTicks(1);
 	}
 
 	_driver->stopMusic();
-	_vm->delay(1000 / 50);
+	_vm->delayWithTicks(1);
 	_driver->setVolume(0x40);
 }
 

Modified: scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp	2009-07-19 15:00:39 UTC (rev 42617)
+++ scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp	2009-07-19 15:36:11 UTC (rev 42618)
@@ -159,7 +159,7 @@
 				// achieve the same more efficiently: Take rate modulo sLen
 				// TODO: This messes up dmaCount and shouldnt happen?
 				if (sLen < rate)
-					warning("Paula: lenght %d is lesser than rate", _voice[voice].length);
+					warning("Paula: length %d is lesser than rate", _voice[voice].length);
 //					rate %= sLen;
 
 				// Repeat as long as necessary.


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




More information about the Scummvm-git-logs mailing list