[Scummvm-cvs-logs] CVS: scummvm/common timer.cpp,1.32,1.33 timer.h,1.20,1.21

Max Horn fingolfin at users.sourceforge.net
Fri Jan 28 15:54:11 CET 2005


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

Modified Files:
	timer.cpp timer.h 
Log Message:
Use class Mutex instead of MutexRef

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- timer.cpp	10 Jan 2005 22:05:35 -0000	1.32
+++ timer.cpp	28 Jan 2005 22:05:42 -0000	1.33
@@ -30,12 +30,9 @@
 
 Timer::Timer(OSystem *system) :
 	_system(system),
-	_mutex(0),
 	_timerHandler(0),
 	_lastTime(0) {
 
-	_mutex = _system->createMutex();
-
 	g_timer = this;
 
 	for (int i = 0; i < MAX_TIMERS; i++) {
@@ -65,8 +62,6 @@
 			_timerSlots[i].counter = 0;
 		}
 	}
-
-	_system->deleteMutex(_mutex);
 }
 
 int Timer::timer_handler(int t) {

Index: timer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- timer.h	10 Jan 2005 22:05:35 -0000	1.20
+++ timer.h	28 Jan 2005 22:05:43 -0000	1.21
@@ -39,7 +39,7 @@
 
 private:
 	OSystem *_system;
-	Common::MutexRef _mutex;
+	Common::Mutex _mutex;
 	void *_timerHandler;
 	int32 _thisTime;
 	int32 _lastTime;





More information about the Scummvm-git-logs mailing list