[Scummvm-cvs-logs] CVS: residual/imuse imuse_script.cpp,1.16,1.17

Marcus Comstedt marcus_c at users.sourceforge.net
Sun Feb 5 09:20:07 CET 2006


Update of /cvsroot/scummvm/residual/imuse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28431/imuse

Modified Files:
	imuse_script.cpp 
Log Message:
Added time functionality to the Driver interface, following the model
from ScummVM.

SDL-specific time code has been moved into the new class DriverSDL,
which now serves as a base class for DriverGL and DriverTinyGL.


Index: imuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_script.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- imuse_script.cpp	5 Feb 2006 16:11:12 -0000	1.16
+++ imuse_script.cpp	5 Feb 2006 17:19:44 -0000	1.17
@@ -19,6 +19,7 @@
 #include "bits.h"
 #include "debug.h"
 #include "timer.h"
+#include "driver.h"
 
 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"
@@ -26,8 +27,6 @@
 #include "imuse/imuse.h"
 #include "imuse/imuse_sndmgr.h"
 
-#include <SDL.h>
-
 void Imuse::flushTracks() {
 	// flushTracks should not lock the stack since all the functions
 	// that call it already do (stopAllSounds, startSound)
@@ -160,7 +159,7 @@
 		if (!foundNotRemoved)
 			break;
 		flushTracks();
-		SDL_Delay(50);
+		g_driver->delayMillis(50);
 	}
 }
 





More information about the Scummvm-git-logs mailing list