X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Ffile.h;h=430571f909d872854e64d11ac43917442541f121;hp=d59cd577fc0f33e1acbcbb62bcaa9fa0bb31c141;hb=f041a31f9a6e19da86a63912e5a8050f216e5bc5;hpb=86e0004bd195bc7f7478cf736871339bddf38127

diff --git a/source/io/file.h b/source/io/file.h
index d59cd57..430571f 100644
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -5,6 +5,7 @@
 #include <string>
 #include "buffered.h"
 #include "filtered.h"
+#include "handle.h"
 #include "seekable.h"
 
 namespace Msp {
@@ -42,10 +43,6 @@ public:
 	File(const std::string &, Mode = M_READ, CreateMode = CreateMode(C_CREATE+C_TRUNCATE));
 	virtual ~File();
 
-	/** Closes the file.  Any attempt to access the file after this will cause
-	an exception to be thrown. */
-	void close();
-
 	void set_block(bool);
 
 protected:
@@ -55,13 +52,10 @@ protected:
 public:
 	virtual void sync();
 
-	virtual unsigned seek(int, SeekType);
-	virtual unsigned tell() const;
-
-	virtual Handle get_event_handle() { return handle; }
+	virtual SeekOffset seek(SeekOffset, SeekType);
+	virtual SeekOffset tell() const;
 
-private:
-	void check_access(Mode) const;
+	virtual const Handle &get_handle(Mode);
 };
 
 inline File::CreateMode operator|(File::CreateMode m, File::CreateMode n)