X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Ffile.h;h=57dc6831449416a0a0e9af75626ac1702757c8ce;hp=05aaf9565a08653f278773e010fee4acb6361779;hb=31e72f50fbb34d86877e5110401c49ce3fefd4bb;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848

diff --git a/source/io/file.h b/source/io/file.h
index 05aaf95..57dc683 100644
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -1,21 +1,29 @@
 #ifndef MSP_IO_FILE_H_
 #define MSP_IO_FILE_H_
 
+#include <stdexcept>
 #include <string>
-#include "base.h"
 #include "buffered.h"
 #include "filtered.h"
-#include "seek.h"
+#include "handle.h"
+#include "seekable.h"
 
 namespace Msp {
 namespace IO {
 
+class file_not_found: public std::runtime_error
+{
+public:
+	file_not_found(const std::string &fn): std::runtime_error(fn) { }
+};
+
+
 /**
 A class for reading and writing files.
 
 Non-blocking mode is not supported on Win32.
 */
-class File: public Base
+class File: public Seekable
 {
 public:
 	enum CreateMode
@@ -48,13 +56,10 @@ protected:
 public:
 	virtual void sync();
 
-	/** Changes the read/write offset of the file.  Returns the new offset. */
-	virtual int seek(int, SeekType);
-	
-	/** Returns the current read/write offset of the file. */
-	virtual int tell() const;
+	virtual unsigned seek(int, SeekType);
+	virtual unsigned tell() const;
 
-	virtual Handle get_event_handle() { return handle; }
+	virtual const Handle &get_event_handle() { return handle; }
 
 private:
 	void check_access(Mode) const;