[Scummvm-cvs-logs] CVS: residual smush.cpp,1.38,1.39 timer.cpp,1.6,1.7 timer.h,1.4,1.5

[Pawel Kolodziejski]

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

Modified Files:
	smush.cpp timer.cpp timer.h 
Log Message:
cleanup

Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- smush.cpp	27 Mar 2004 14:28:53 -0000	1.38
+++ smush.cpp	27 Mar 2004 14:52:31 -0000	1.39
@@ -50,7 +50,6 @@
 	_movieTime = 0;
 	_surface = NULL;
 	_bufSurface = NULL;
-	_timerMutex = g_timer->getMutex();
 }
 
 Smush::~Smush() {
@@ -78,15 +77,11 @@
 	    _buf = (byte *)_bufSurface->pixels;
 	}
 
-	while (g_timerCallbackRunning) {};
-	g_timerLock = true;
 	g_timer->installTimerProc(&timerCallback, _speed, NULL);
-	g_timerLock = false;
 }
 
 void Smush::deinit() {
     g_timer->removeTimerProc(&timerCallback);
-	g_timerLock = false;
 
 	_videoFinished = true;
 	_videoPause = true;

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/timer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- timer.cpp	27 Mar 2004 14:28:53 -0000	1.6
+++ timer.cpp	27 Mar 2004 14:52:31 -0000	1.7
@@ -118,8 +118,8 @@
 	assert(interval > 0);
 	StackLock lock(_mutex);
 
-	while (g_timerCallbackRunning) {};
 	g_timerLock = true;
+	while (g_timerCallbackRunning) {};
 
 	for (int l = 0; l < MAX_TIMERS; l++) {
 		if (!_timerSlots[l].procedure) {
@@ -141,8 +141,8 @@
 void Timer::removeTimerProc(TimerProc procedure) {
 	StackLock lock(_mutex);
 
-	while (g_timerCallbackRunning) {};
 	g_timerLock = true;
+	while (g_timerCallbackRunning) {};
 
 	for (int l = 0; l < MAX_TIMERS; l++) {
 		if (_timerSlots[l].procedure == procedure) {
@@ -155,7 +155,3 @@
 
 	g_timerLock = false;
 }
-
-MutexRef Timer::getMutex() {
-    return _mutex;
-}

Index: timer.h
===================================================================
RCS file: /cvsroot/scummvm/residual/timer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- timer.h	27 Mar 2004 14:28:53 -0000	1.4
+++ timer.h	27 Mar 2004 14:52:31 -0000	1.5
@@ -63,7 +63,6 @@
 	 */
 	void removeTimerProc(TimerProc proc);
 
-	MutexRef getMutex();
 protected:
 	static int timer_handler(int t);
 	int handler(int t);