X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fpoll.h;h=f59b499ddbc3bad3702c42a56507c32969ddac84;hb=e46de55d3c8f65d3b0eeaee76247476695e9eb7c;hp=6367d8f2b301544f26953220284868d7658b22fb;hpb=6e0fd758970bcb5bad5e3f2454b694cc4d7b4b66;p=libs%2Fcore.git

diff --git a/source/io/poll.h b/source/io/poll.h
index 6367d8f..f59b499 100644
--- a/source/io/poll.h
+++ b/source/io/poll.h
@@ -1,14 +1,10 @@
 #ifndef MSP_IO_POLL_H_
 #define MSP_IO_POLL_H_
 
-#ifndef WIN32
-#include <poll.h>
-#endif
 #include <list>
 #include <map>
 #include <vector>
 #include <msp/time/timedelta.h>
-#include "types.h"
 
 namespace Msp {
 namespace IO {
@@ -45,24 +41,16 @@ public:
 		Slot(Base *o, PollEvent e): object(o), events(e) { }
 	};
 
-	typedef std::list<Slot> SlotSeq;
+	typedef std::list<Slot> SlotList;
 private:
-	typedef std::map<Base *, Slot> SlotMap;
+	typedef std::map<Base *, PollEvent> EventMap;
 
-#ifdef WIN32
-	struct pollfd
-	{
-		Handle fd;
-	};
-#endif
+	struct Private;
 
-	SlotMap objects;
-	std::vector<pollfd> pfd;
-	bool pfd_dirty;
-	SlotSeq poll_result;
-
-	void rebuild_pfd();
-	int do_poll(int);
+	EventMap objects;
+	Private *priv;
+	bool objs_changed;
+	SlotList poll_result;
 
 public:
 	Poller();
@@ -70,7 +58,11 @@ public:
 	void set_object(Base &, PollEvent);
 	int poll();
 	int poll(const Time::TimeDelta &);
-	const SlotSeq &get_result() const { return poll_result; }
+private:
+	void rebuild_array();
+	int do_poll(int);
+public:
+	const SlotList &get_result() const { return poll_result; }
 };
 
 PollEvent poll(Base &, PollEvent);