[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.10,1.11

Pawel Kolodziejski aquadran at users.sourceforge.net
Thu Mar 20 02:59:02 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv3624

Modified Files:
	smush_player.cpp 
Log Message:
take lock mutex mechanism also processKbd() and waitForTimer().
I hope it will finally solve locking gfx resources

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- smush_player.cpp	19 Mar 2003 19:09:50 -0000	1.10
+++ smush_player.cpp	20 Mar 2003 10:58:10 -0000	1.11
@@ -884,10 +884,10 @@
 	init();
 
 	while (true) {
+		_scumm->_system->lock_mutex(_mutex);
 		_scumm->processKbd();
 		_scumm->waitForTimer(1);
 		if(_updateNeeded == true) {
-			_scumm->_system->lock_mutex(_mutex);
 			
 			uint32 end_time, start_time = _scumm->_system->get_msecs();
 			_scumm->_system->update_screen();
@@ -895,8 +895,8 @@
 			end_time = _scumm->_system->get_msecs();
 			debug(4, "Smush stats: BackendUpdateScreen( %03d )", end_time - start_time);
 
-			_scumm->_system->unlock_mutex(_mutex);
 		}
+		_scumm->_system->unlock_mutex(_mutex);
 		if (_scumm->_videoFinished == true)
 			break;
 		if (_scumm->_saveLoadFlag)





More information about the Scummvm-git-logs mailing list