[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_script.cpp,1.7.2.3,1.7.2.4 dimuse_track.cpp,1.17.2.3,1.17.2.4

Nicolas Bacca arisme at users.sourceforge.net
Sun Jul 18 09:27:00 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16420

Modified Files:
      Tag: branch-0-6-0
	dimuse_script.cpp dimuse_track.cpp 
Log Message:
Fix Digital Imuse deadlocks for CE platforms. Other platforms using event-based timers may be interested in it, too

Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -d -r1.7.2.3 -r1.7.2.4
--- dimuse_script.cpp	26 Jun 2004 09:18:29 -0000	1.7.2.3
+++ dimuse_script.cpp	18 Jul 2004 16:26:18 -0000	1.7.2.4
@@ -381,6 +381,10 @@
 			break;
 		flushTracks();
 		_vm->_system->delay_msecs(50);
+#ifdef _WIN32_WCE
+		_vm->parseEvents(); // timers are events, we need to consume them
+#endif
+
 	}
 }
 

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -d -r1.17.2.3 -r1.17.2.4
--- dimuse_track.cpp	26 Jun 2004 09:18:29 -0000	1.17.2.3
+++ dimuse_track.cpp	18 Jul 2004 16:26:18 -0000	1.17.2.4
@@ -82,6 +82,9 @@
 
 	Track *track = _track[l];
 	for (;;) {
+#ifdef _WIN32_WCE
+		_vm->parseEvents(); // timers are events, we need to consume them
+#endif
 		flushTracks();
 		if (!track->used) {
 			track->pan = 64;





More information about the Scummvm-git-logs mailing list