X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fbuffered.h;h=39c8159ff18c7fa091b8f91c4ab898d0bd36b880;hb=9b38e20254913629a0db40e8eb8e1c42e1728e41;hp=095be0f01625eaac5672278a7f20ae724268b227;hpb=d16185720fa344263367dbd50c61bfc8183d99a4;p=libs%2Fcore.git

diff --git a/source/io/buffered.h b/source/io/buffered.h
index 095be0f..39c8159 100644
--- a/source/io/buffered.h
+++ b/source/io/buffered.h
@@ -1,41 +1,47 @@
 #ifndef MSP_IO_BUFFERED_H_
 #define MSP_IO_BUFFERED_H_
 
+#include <sigc++/trackable.h>
 #include "base.h"
 
 namespace Msp {
 namespace IO {
 
-class Buffered: public Base
+class Buffered: public Base, public sigc::trackable
 {
 private:
 	Base &below;
-	unsigned buf_size;
-	char *buf;
-	char *begin;
-	char *end;
-	Mode cur_op;
+	std::size_t buf_size = 0;
+	char *buf = 0;
+	char *begin = 0;
+	char *end = 0;
+	Mode cur_op = M_NONE;
 
 public:
-	Buffered(Base &, unsigned =8192);
+	Buffered(Base &, unsigned = 8192);
 	~Buffered();
 
+	virtual void set_block(bool);
+	virtual void set_inherit(bool);
+
 	void flush();
 
 protected:
-	unsigned do_write(const char *, unsigned);
-	unsigned do_read(char *, unsigned);
+	virtual std::size_t do_write(const char *, std::size_t);
+	virtual std::size_t do_read(char *, std::size_t);
 public:
-	unsigned put(char);
+	virtual std::size_t put(char);
 
 	bool getline(std::string &);
 	int get();
 
+	virtual const Handle &get_handle(Mode);
+
 private:
 	void set_op(Mode);
 public:
 	Mode get_current_op() const { return cur_op; }
-	unsigned get_current_size() const;
+	std::size_t get_current_size() const;
 };
 
 } // namespace IO