aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2005-01-28 22:05:51 +0000
committerMax Horn2005-01-28 22:05:51 +0000
commitabd12dd1b63d9e680bdc157fd5aa1fdb579e111e (patch)
treeda026a16edefcc56119ef2376eb0b26f7ec9d500 /common
parentc62d82450b7fc4d64bf6102cb8074457e3d0cb47 (diff)
downloadscummvm-rg350-abd12dd1b63d9e680bdc157fd5aa1fdb579e111e.tar.gz
scummvm-rg350-abd12dd1b63d9e680bdc157fd5aa1fdb579e111e.tar.bz2
scummvm-rg350-abd12dd1b63d9e680bdc157fd5aa1fdb579e111e.zip
Use class Mutex instead of MutexRef
svn-id: r16679
Diffstat (limited to 'common')
-rw-r--r--common/timer.cpp5
-rw-r--r--common/timer.h2
2 files changed, 1 insertions, 6 deletions
diff --git a/common/timer.cpp b/common/timer.cpp
index 230366ad0d..2075243106 100644
--- a/common/timer.cpp
+++ b/common/timer.cpp
@@ -30,12 +30,9 @@ Timer *g_timer = NULL;
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 @@ Timer::~Timer() {
_timerSlots[i].counter = 0;
}
}
-
- _system->deleteMutex(_mutex);
}
int Timer::timer_handler(int t) {
diff --git a/common/timer.h b/common/timer.h
index 6b3509f41c..d509402314 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -39,7 +39,7 @@ public:
private:
OSystem *_system;
- Common::MutexRef _mutex;
+ Common::Mutex _mutex;
void *_timerHandler;
int32 _thisTime;
int32 _lastTime;