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/EventRecorder.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/EventRecorder.h')
| -rw-r--r-- | common/EventRecorder.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/EventRecorder.h b/common/EventRecorder.h index 8377d9e8bd..43a08b08cd 100644 --- a/common/EventRecorder.h +++ b/common/EventRecorder.h @@ -56,8 +56,12 @@ public: /** TODO: Add documentation, this is only used by the backend */ void processMillis(uint32 &millis); + /** TODO: Add documentation, this is only used by the backend */ + bool processDelayMillis(uint &msecs); + private: bool notifyEvent(const Event &ev); + bool notifyPoll(); bool pollEvent(Event &ev); bool allowMapping() const { return false; } @@ -72,6 +76,7 @@ private: volatile uint32 _recordCount; volatile uint32 _lastRecordEvent; volatile uint32 _recordTimeCount; + volatile uint32 _lastEventMillis; WriteStream *_recordFile; WriteStream *_recordTimeFile; MutexRef _timeMutex; @@ -103,4 +108,3 @@ private: } // End of namespace Common #endif - |