aboutsummaryrefslogtreecommitdiff
path: root/backends/timer
diff options
context:
space:
mode:
authorEugene Sandulenko2011-08-05 10:15:20 +0100
committerEugene Sandulenko2011-08-06 11:28:35 +0100
commit78f1ea769060cd631c210fc01020bb921afe3607 (patch)
tree3d12aedc45efe68e6e5d81ee24d90c428bfc186c /backends/timer
parente72c2fae8896b14553f2e2246726b2e426f0e9bb (diff)
downloadscummvm-rg350-78f1ea769060cd631c210fc01020bb921afe3607.tar.gz
scummvm-rg350-78f1ea769060cd631c210fc01020bb921afe3607.tar.bz2
scummvm-rg350-78f1ea769060cd631c210fc01020bb921afe3607.zip
OSYSTEM: extended installTimerProc() with timer ID parameter
Diffstat (limited to 'backends/timer')
-rw-r--r--backends/timer/default/default-timer.cpp2
-rw-r--r--backends/timer/default/default-timer.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp
index 8480fcc7ee..e17aaea444 100644
--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@@ -109,7 +109,7 @@ void DefaultTimerManager::handler() {
}
}
-bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, void *refCon) {
+bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, void *refCon, const Common::String &id) {
assert(interval > 0);
Common::StackLock lock(_mutex);
diff --git a/backends/timer/default/default-timer.h b/backends/timer/default/default-timer.h
index 66d2e3b091..33dd46cc57 100644
--- a/backends/timer/default/default-timer.h
+++ b/backends/timer/default/default-timer.h
@@ -22,6 +22,7 @@
#ifndef BACKENDS_TIMER_DEFAULT_H
#define BACKENDS_TIMER_DEFAULT_H
+#include "common/str.h"
#include "common/timer.h"
#include "common/mutex.h"
@@ -36,7 +37,7 @@ private:
public:
DefaultTimerManager();
virtual ~DefaultTimerManager();
- virtual bool installTimerProc(TimerProc proc, int32 interval, void *refCon);
+ virtual bool installTimerProc(TimerProc proc, int32 interval, void *refCon, const Common::String &id);
virtual void removeTimerProc(TimerProc proc);
/**