diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /common/timer.h | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'common/timer.h')
| -rw-r--r-- | common/timer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/timer.h b/common/timer.h index 40438f078c..3db32df76a 100644 --- a/common/timer.h +++ b/common/timer.h @@ -23,6 +23,7 @@ #define COMMON_TIMER_H #include "common/scummsys.h" +#include "common/str.h" #include "common/noncopyable.h" namespace Common { @@ -43,9 +44,10 @@ public: * @param proc the callback * @param interval the interval in which the timer shall be invoked (in microseconds) * @param refCon an arbitrary void pointer; will be passed to the timer callback + * @param id unique string id of the installed timer. Used by the event recorder * @return true if the timer was installed successfully, false otherwise */ - virtual bool installTimerProc(TimerProc proc, int32 interval, void *refCon) = 0; + virtual bool installTimerProc(TimerProc proc, int32 interval, void *refCon, const Common::String &id) = 0; /** * Remove the given timer callback. It will not be invoked anymore, |