Implement get_handle in File and Pipe

[libs/core.git] / source / io / file.h

diff --git a/source/io/file.h b/source/io/file.h
index d59cd577fc0f33e1acbcbb62bcaa9fa0bb31c141..430571f909d872854e64d11ac43917442541f121 100644 (file)
--- 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)