better, less hacky, more OOP-friendly scheduler design

1 files changed, 6 insertions, 8 deletions

diff --git a/src/NDS.h b/src/NDS.h
index de038b2..89ebb1c 100644
--- a/src/NDS.h
+++ b/src/NDS.h
@@ -20,6 +20,7 @@
 #define NDS_H
 
 #include <string>
+#include <functional>
 
 #include "Platform.h"
 #include "Savestate.h"
@@ -57,12 +58,8 @@ enum
     Event_MAX
 };
 
-struct SchedEvent
-{
-    void (*Func)(u32 param);
-    u64 Timestamp;
-    u32 Param;
-};
+typedef std::function<void(u32)> EventFunc;
+#define MemberEventFunc(cls,func) std::bind(&cls::func,this,std::placeholders::_1)
 
 enum
 {
@@ -297,8 +294,9 @@ void SetLidClosed(bool closed);
 void CamInputFrame(int cam, u32* data, int width, int height, bool rgb);
 void MicInputFrame(s16* data, int samples);
 
-void ScheduleEvent(u32 id, bool periodic, s32 delay, void (*func)(u32), u32 param);
-void ScheduleEvent(u32 id, u64 timestamp, void (*func)(u32), u32 param);
+void RegisterEventFunc(u32 id, u32 funcid, EventFunc func);
+void UnregisterEventFunc(u32 id, u32 funcid);
+void ScheduleEvent(u32 id, bool periodic, s32 delay, u32 funcid, u32 param);
 void CancelEvent(u32 id);
 
 void debug(u32 p);