X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Feventdispatcher.cpp;h=f98474c227d4cc7e1fd8d1a2e03274a6f21c89d5;hp=8660b5b29562029daef671c892a325db51dcd783;hb=242a4a9abe1e1113b5eb39aa751aa054f696d7be;hpb=d16185720fa344263367dbd50c61bfc8183d99a4

diff --git a/source/io/eventdispatcher.cpp b/source/io/eventdispatcher.cpp
index 8660b5b..f98474c 100644
--- a/source/io/eventdispatcher.cpp
+++ b/source/io/eventdispatcher.cpp
@@ -1,23 +1,22 @@
-#include <msp/time/units.h>
+#include <msp/time/utils.h>
 #include "base.h"
 #include "eventdispatcher.h"
 #include "eventobject.h"
 #include "poll.h"
 
+using namespace std;
+
 namespace Msp {
 namespace IO {
 
-EventDispatcher::EventDispatcher()
-{ }
-
 void EventDispatcher::add(EventObject &obj)
 {
-	SlotMap::iterator i = objects.find(&obj);
+	Slot slot(*this, obj);
+	set<Slot>::iterator i = objects.find(slot);
 	if(i==objects.end())
 	{
-		i = objects.insert(SlotMap::value_type(&obj, Slot(&obj))).first;
-		i->second.evch_conn = obj.signal_events_changed.connect(sigc::bind(sigc::mem_fun(this, &EventDispatcher::object_events_changed), &obj));
-		i->second.del_conn = obj.signal_deleted.connect(sigc::bind(sigc::mem_fun(this, &EventDispatcher::object_deleted), &obj));
+		i = objects.insert(slot).first;
+		i->connect_signals();
 
 		if(obj.get_events())
 			poller.set_object(obj, obj.get_events());
@@ -26,11 +25,9 @@ void EventDispatcher::add(EventObject &obj)
 
 void EventDispatcher::remove(EventObject &obj)
 {
-	SlotMap::iterator i = objects.find(&obj);
+	set<Slot>::iterator i = objects.find(Slot(*this, obj));
 	if(i!=objects.end())
 	{
-		i->second.evch_conn.disconnect();
-		i->second.del_conn.disconnect();
 		objects.erase(i);
 
 		poller.set_object(obj, P_NONE);
@@ -55,21 +52,42 @@ void EventDispatcher::tick(const Time::TimeDelta &dt)
 		dispatch();
 }
 
-void EventDispatcher::object_events_changed(PollEvent ev, EventObject *obj)
+void EventDispatcher::tick(const Time::Timer &timer)
 {
-	poller.set_object(*obj, ev);
+	const Time::TimeStamp &timeout = timer.get_next_timeout();
+	if(timeout)
+		tick(timeout-Time::now());
+	else
+		tick();
 }
 
-void EventDispatcher::object_deleted(EventObject *obj)
+void EventDispatcher::dispatch()
 {
-	remove(*obj);
+	const vector<Poller::PolledObject> &result = poller.get_result();
+	for(vector<Poller::PolledObject>::const_iterator i=result.begin(); i!=result.end(); ++i)
+		i->object->event(i->events);
 }
 
-void EventDispatcher::dispatch()
+
+EventDispatcher::Slot::Slot(EventDispatcher &d, EventObject &o):
+	disp(d),
+	obj(o)
+{ }
+
+void EventDispatcher::Slot::connect_signals() const
 {
-	const Poller::SlotList &result = poller.get_result();
-	for(Poller::SlotList::const_iterator i=result.begin(); i!=result.end(); ++i)
-		i->object->event(i->events);
+	obj.signal_events_changed.connect(sigc::mem_fun(this, &Slot::events_changed));
+	obj.signal_deleted.connect(sigc::mem_fun(this, &Slot::deleted));
+}
+
+void EventDispatcher::Slot::events_changed(PollEvent ev) const
+{
+	disp.poller.set_object(obj, ev);
+}
+
+void EventDispatcher::Slot::deleted() const
+{
+	disp.remove(obj);
 }
 
 } // namespace IO