X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fzlibcompressed.h;h=af75aecd51d7d843d92390be68cb1a955e52e2a0;hb=cc541830f00cc3238edb82ff2e14e8b9060645b6;hp=1ee427413ddc1cc448338278fab543f19bbd2ca9;hpb=8ed14b63ab6249e9fc2a3a691cf8ffbf49166deb;p=libs%2Fcore.git

diff --git a/source/io/zlibcompressed.h b/source/io/zlibcompressed.h
index 1ee4274..af75aec 100644
--- a/source/io/zlibcompressed.h
+++ b/source/io/zlibcompressed.h
@@ -3,6 +3,7 @@
 
 #include <stdexcept>
 #include <string>
+#include <sigc++/trackable.h>
 #include "base.h"
 
 namespace Msp {
@@ -27,7 +28,7 @@ operates on top of another I/O object.
 To ensure proper termination of the compressed data stream, the ZlibCompressed
 object must be destroyed before the underlying object is closed.
 */
-class ZlibCompressed: public Base
+class ZlibCompressed: public Base, public sigc::trackable
 {
 private:
 	struct Private;
@@ -36,6 +37,7 @@ private:
 	unsigned buffer_size;
 	unsigned char *in_buffer;
 	unsigned char *out_buffer;
+	bool stream_end;
 	Private *priv;
 
 public:
@@ -44,8 +46,19 @@ public:
 	compression quality, ranging from 1 (fastest) to 9 (best compression). */
 	ZlibCompressed(Base &, unsigned level = 9);
 
+	/** Creates a zlib de/compression object.  Mode must be either read or
+	write, and compatible with the underlying object. */
+	ZlibCompressed(Base &, Mode, unsigned level = 9);
+
+private:
+	void init(unsigned);
+
+public:
 	virtual ~ZlibCompressed();
 
+	virtual void set_block(bool);
+	virtual void set_inherit(bool);
+
 	void flush();
 
 protected:
@@ -60,6 +73,8 @@ private:
 
 public:
 	virtual unsigned do_read(char *, unsigned);
+
+	virtual const Handle &get_handle(Mode);
 };
 
 } // namespace IO