[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.120,1.121 smush_player.h,1.30,1.31

[Pawel Kolodziejski]

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

Modified Files:
	smush_player.cpp smush_player.h 
Log Message:
remove useless mutex

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- smush_player.cpp	26 Apr 2004 09:04:08 -0000	1.120
+++ smush_player.cpp	1 May 2004 18:53:03 -0000	1.121
@@ -217,8 +217,6 @@
 
 SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) {
 	_vm = scumm;
-	_mutex = g_system->createMutex();
-
 	_version = -1;
 	_nbframes = 0;
 	_smixer = 0;
@@ -248,11 +246,9 @@
 
 SmushPlayer::~SmushPlayer() {
 	release();
-	g_system->deleteMutex(_mutex);
 }
 
 void SmushPlayer::init() {
-	Common::StackLock lock(_mutex, "SmushPlayer::init()");
 	_frame = 0;
 	_vm->_videoFinished = false;
 	_vm->setDirtyColors(0, 255);
@@ -264,7 +260,6 @@
 }
 
 void SmushPlayer::release() {
-	Common::StackLock lock(_mutex, "SmushPlayer::release()");
 	_vm->_timer->removeTimerProc(&timerCallback);
 
 	_vm->_videoFinished = true;
@@ -959,7 +954,6 @@
 }
 
 void SmushPlayer::parseNextFrame() {
-	Common::StackLock lock(_mutex, "SmushPlayer::parseNextFrame()");
 	if (_vm->_smushPaused)
 		return;
 

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- smush_player.h	26 Apr 2004 09:04:08 -0000	1.30
+++ smush_player.h	1 May 2004 18:53:03 -0000	1.31
@@ -42,7 +42,6 @@
 	int _version;
 	int32 _nbframes;
 	SmushMixer *_smixer;
-	OSystem::MutexRef _mutex;
 	int16 _deltaPal[0x300];
 	byte _pal[0x300];
 	StringResource *_strings;