[Scummvm-cvs-logs] SF.net SVN: scummvm:[42621] scummvm/branches/gsoc2009-mods/engines/kyra/ sound_amiga.cpp

nolange at users.sourceforge.net nolange at users.sourceforge.net
Sun Jul 19 18:59:39 CEST 2009


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

Log Message:
-----------
reverted fadeout to using plain delay as delayWithTicks crashes >(

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

Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-07-19 16:11:05 UTC (rev 42620)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-07-19 16:59:39 UTC (rev 42621)
@@ -45,6 +45,7 @@
 }
 
 SoundAmiga::~SoundAmiga() {
+	_mixer->stopHandle(_musicHandle);
 	delete _driver;
 }
 
@@ -131,11 +132,12 @@
 void SoundAmiga::beginFadeOut() {
 	for (int i = 0x3F; i >= 0; --i) {
 		_driver->setVolume((byte)i);
-		_vm->delayWithTicks(1);
+		// TODO: use _tickLength or delayWithTicks but thats bugged
+		_vm->delay(1000 / 60);
 	}
 
 	_driver->stopMusic();
-	_vm->delayWithTicks(1);
+	_vm->delay(1000 / 60);
 	_driver->setVolume(0x40);
 }
 


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