X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput.h;h=a9c96f48abce9cdf9e533e640f3913c8849e0d7f;hb=HEAD;hp=e03dea1e839714e23416b8fed7fea7cb68f8ed97;hpb=8ff59df1f2e603557eceacbc81a8dc44de051dae;p=libs%2Fdatafile.git

diff --git a/source/input.h b/source/input.h
index e03dea1..6cc53e7 100644
--- a/source/input.h
+++ b/source/input.h
@@ -1,29 +1,29 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
 #ifndef MSP_DATAFILE_INPUT_H_
 #define MSP_DATAFILE_INPUT_H_
 
-#include <istream>
+#include <msp/core/noncopyable.h>
+#include <msp/io/base.h>
 
 namespace Msp {
 namespace DataFile {
 
-class Input
+class Input: private NonCopyable
 {   
+private:
+	IO::Base *in = nullptr;
+	IO::Base *compressed = nullptr;
+	unsigned line = 1;
+	int next = -1;
+
 public:
-	Input(std::istream &); 
+	Input(IO::Base &); 
+	~Input();
+
+	void set_decompress();
 	int get();
 	int peek();
 	unsigned get_line_number() const { return line; }
-	operator bool() const { return in; }
-private:
-	std::istream &in;
-	unsigned line;
-	int next;
+	explicit operator bool() const;
 };  
 
 } // namespace DataFile