X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fpipe.h;h=73731776856a2fc1c9d90530935fc4009ffaf2cc;hb=e4afb5edb0b7834ef4872218c99207e6b589e9ce;hp=71edf7eb3246f125ceb09ccd90495381807c8b85;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848;p=libs%2Fcore.git

diff --git a/source/io/pipe.h b/source/io/pipe.h
index 71edf7e..7373177 100644
--- a/source/io/pipe.h
+++ b/source/io/pipe.h
@@ -1,30 +1,23 @@
 #ifndef MSP_IO_PIPE_H_
 #define MSP_IO_PIPE_H_
 
-#include "base.h"
+#include "eventobject.h"
+#include "eventreader.h"
+#include "handle.h"
 
 namespace Msp {
 namespace IO {
 
-class Pipe: public Base
+class Pipe: public EventObject
 {
 private:
 	Handle handle[2];
-#ifdef WIN32
-	OVERLAPPED *overlapped;
-	Handle event;
-	unsigned buf_size;
-	char *buffer;
-	unsigned buf_avail;
-	char *buf_next;
-#endif
+	EventReader reader;
 
 public:
 	Pipe();
 	~Pipe();
 
-	void close();
-
 	void set_block(bool);
 
 protected:
@@ -32,7 +25,7 @@ protected:
 	virtual unsigned do_read(char *, unsigned);
 
 public:
-	virtual Handle get_event_handle();
+	virtual const Handle &get_event_handle() { return reader.get_event(); }
 };
 
 } // namespace IO