From 7ca970e5db84020e4735afccf43ede4d52ac0bf0 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 30 Oct 2016 17:15:40 +0200
Subject: [PATCH] Add integration between EventDispatcher and Timer

---
 source/io/eventdispatcher.cpp | 10 ++++++++++
 source/io/eventdispatcher.h   |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/source/io/eventdispatcher.cpp b/source/io/eventdispatcher.cpp
index 144ad49..cf37c1e 100644
--- a/source/io/eventdispatcher.cpp
+++ b/source/io/eventdispatcher.cpp
@@ -1,3 +1,4 @@
+#include <msp/time/utils.h>
 #include "base.h"
 #include "eventdispatcher.h"
 #include "eventobject.h"
@@ -57,6 +58,15 @@ void EventDispatcher::tick(const Time::TimeDelta &dt)
 		dispatch();
 }
 
+void EventDispatcher::tick(const Time::Timer &timer)
+{
+	const Time::TimeStamp &timeout = timer.get_next_timeout();
+	if(timeout)
+		tick(timeout-Time::now());
+	else
+		tick();
+}
+
 void EventDispatcher::object_events_changed(PollEvent ev, EventObject *obj)
 {
 	poller.set_object(*obj, ev);
diff --git a/source/io/eventdispatcher.h b/source/io/eventdispatcher.h
index 25455ab..b542d67 100644
--- a/source/io/eventdispatcher.h
+++ b/source/io/eventdispatcher.h
@@ -4,6 +4,7 @@
 #include <sigc++/connection.h>
 #include <sigc++/trackable.h>
 #include <msp/time/timedelta.h>
+#include <msp/time/timer.h>
 #include "poll.h"
 
 namespace Msp {
@@ -45,6 +46,10 @@ public:
 	waits at most the specified time before returning. */
 	void tick(const Time::TimeDelta &);
 
+	/** Checks for and dispatches events.  If there are no events available,
+	waits until the timer's next timeout before returning. */
+	void tick(const Time::Timer &);
+
 private:
 	void object_events_changed(PollEvent, EventObject *);
 	void object_deleted(EventObject *);
-- 
2.43.0