From 78f1ea769060cd631c210fc01020bb921afe3607 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 5 Aug 2011 10:15:20 +0100
Subject: OSYSTEM: extended installTimerProc() with timer ID parameter

---
 common/timer.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'common/timer.h')

diff --git a/common/timer.h b/common/timer.h
index 40438f078c..621751f825 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -43,9 +43,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,
-- 
cgit v1.2.3


From fb0a05c4cdd3f7a9151bd2c69a8acc670ed51108 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sat, 6 Aug 2011 15:49:11 +0100
Subject: COMMON: Fix Missing Dependency In Timer Header.

This should fix the PSP build.
---
 common/timer.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'common/timer.h')

diff --git a/common/timer.h b/common/timer.h
index 621751f825..dad81b037b 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -23,6 +23,7 @@
 #define COMMON_TIMER_H
 
 #include "common/scummsys.h"
+#include "common/string.h"
 #include "common/noncopyable.h"
 
 namespace Common {
-- 
cgit v1.2.3


From ad936e9f8cf4929c4b1c5edce35ac08406a8e064 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sat, 6 Aug 2011 15:52:36 +0100
Subject: COMMON: Corrected Previous Commit.

Common::String class is in common/str.h, not string.h...
---
 common/timer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/timer.h')

diff --git a/common/timer.h b/common/timer.h
index dad81b037b..3db32df76a 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -23,7 +23,7 @@
 #define COMMON_TIMER_H
 
 #include "common/scummsys.h"
-#include "common/string.h"
+#include "common/str.h"
 #include "common/noncopyable.h"
 
 namespace Common {
-- 
cgit v1.2.3