X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Ffile.h;h=ececa8dc19c28f53d2e690db06af481a81555e52;hp=90a1041ccda6520db5386b724f43fe6e936bfe85;hb=481b844ed7d180ffbf70223075f2fc1ffdb5b444;hpb=933356a36607f5d4480172e285071d4d7dfc5a7b

diff --git a/source/io/file.h b/source/io/file.h
index 90a1041..ececa8d 100644
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -52,9 +52,12 @@ public:
 	write access is requested and the file does exist, it is created.  Otherwise
 	a missing file is an error. */
 	File(const std::string &, Mode = M_READ, CreateMode = C_OVERWRITE);
+private:
+	void platform_init(const std::string &, CreateMode);
+public:
 	virtual ~File();
 
-	void set_block(bool);
+	virtual void set_block(bool);
 
 protected:
 	virtual unsigned do_write(const char *, unsigned);
@@ -78,7 +81,33 @@ inline File::CreateMode operator&(File::CreateMode m, File::CreateMode n)
 inline File::CreateMode operator~(File::CreateMode m)
 { return File::CreateMode(~static_cast<int>(m)); }
 
-typedef Filtered<File, Buffered> BufferedFile;
+
+class BufferedFile: public Seekable
+{
+private:
+	File file;
+	Buffered buffer;
+	SeekOffset position;
+
+public:
+	BufferedFile(const std::string &, Mode = M_READ, File::CreateMode = File::C_OVERWRITE);
+
+	virtual void set_block(bool);
+
+protected:
+	virtual unsigned do_write(const char *, unsigned);
+	virtual unsigned do_read(char *, unsigned);
+public:
+	virtual unsigned put(char);
+
+	virtual bool getline(std::string &);
+	virtual int get();
+
+	virtual const Handle &get_handle(Mode);
+
+	virtual SeekOffset seek(SeekOffset, SeekType);
+	virtual SeekOffset tell() const { return position; }
+};
 
 } // namespace IO
 } // namespace Msp