diff src/console/Vfs_File.h @ 316:fb513e10174e trunk

[svn] - merge libconsole-blargg into mainline libconsole: + obsoletes plugins-ugly:sapplug

--- a/src/console/Vfs_File.h	Wed Nov 29 14:42:11 2006 -0800
+++ b/src/console/Vfs_File.h	Thu Nov 30 19:54:33 2006 -0800
@@ -1,23 +1,29 @@
-
 // File_Reader based on a VFSFile
 
 #ifndef VFS_FILE_H
 #define VFS_FILE_H
 
-#include "abstract_file.h"
+#include "Data_Reader.h"
+
+#include "audacious/vfs.h"
 
 class Vfs_File_Reader : public File_Reader {
-	void* file_;
+public:
+	void reset( VFSFile* ); // use already-open file and doesn't close it in close()
+	error_t open( const char* path );
+	VFSFile* file() const { return file_; }
+	void close();
+	
 public:
 	Vfs_File_Reader();
 	~Vfs_File_Reader();
-	error_t open( const char* );
 	long size() const;
 	long read_avail( void*, long );
 	long tell() const;
 	error_t seek( long );
-	void close();
+private:
+	VFSFile* file_;
+	VFSFile* owned_file_;
 };
 
 #endif
-