[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.15,1.16 smush_player.h,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Wed Apr 30 12:12:14 CEST 2003


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

Modified Files:
	smush_player.cpp smush_player.h 
Log Message:
moved screen mutex from smush into SDL backend (other backends have to make sure they are thread safe by themselves)

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- smush_player.cpp	30 Apr 2003 11:26:36 -0000	1.15
+++ smush_player.cpp	30 Apr 2003 19:11:32 -0000	1.16
@@ -222,14 +222,10 @@
 	_speed = speed;
 	_subtitles = subtitles;
 	_smushProcessFrame = false;
-	
-	_mutex = _scumm->_system->create_mutex();
 }
 
 SmushPlayer::~SmushPlayer() {
 	deinit();
-	if (_mutex)
-		_scumm->_system->delete_mutex (_mutex);
 }
 
 void SmushPlayer::init() {
@@ -862,15 +858,11 @@
 }
 
 void SmushPlayer::updateScreen() {
-	_scumm->_system->lock_mutex(_mutex);
-
 	uint32 end_time, start_time = _scumm->_system->get_msecs();
 	_scumm->_system->copy_rect(_data, _width, 0, 0, _width, _height);
 	_updateNeeded = true;
 	end_time = _scumm->_system->get_msecs();
 	debug(4, "Smush stats: updateScreen( %03d )", end_time - start_time);
-
-	_scumm->_system->unlock_mutex(_mutex);
 }
 
 void SmushPlayer::play(const char *filename, const char *directory) {
@@ -887,7 +879,6 @@
 	init();
 
 	while (true) {
-		_scumm->_system->lock_mutex(_mutex);
 		_scumm->parseEvents();
 		_scumm->processKbd();
 		if(_updateNeeded == true) {
@@ -899,7 +890,6 @@
 			debug(4, "Smush stats: BackendUpdateScreen( %03d )", end_time - start_time);
 
 		}
-		_scumm->_system->unlock_mutex(_mutex);
 		if (_scumm->_videoFinished == true)
 			break;
 		if (_scumm->_saveLoadFlag)

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- smush_player.h	19 Mar 2003 19:09:51 -0000	1.4
+++ smush_player.h	30 Apr 2003 19:11:33 -0000	1.5
@@ -62,8 +62,6 @@
 	bool _alreadyInit;
 	int _speed;
 	bool _outputSound;
-	
-	void *_mutex;
 
 public:
 





More information about the Scummvm-git-logs mailing list