Avoid reader/writer duplication in every encoder/decoder

common/rfb/Decoder.cxx

@@ -27,6 +27,10 @@
 
 using namespace rfb;
 
+Decoder::Decoder(CMsgReader* reader_) : reader(reader_)
+{
+}
+
 Decoder::~Decoder()
 {
 }

common/rfb/Decoder.h

@@ -27,11 +27,14 @@ namespace rfb {
 
   class Decoder {
   public:
+    Decoder(CMsgReader* reader);
     virtual ~Decoder();
     virtual void readRect(const Rect& r, CMsgHandler* handler)=0;
 
     static bool supported(int encoding);
     static Decoder* createDecoder(int encoding, CMsgReader* reader);
+  protected:
+    CMsgReader* reader;
   };
 }
 

common/rfb/Encoder.cxx

@@ -25,9 +25,14 @@
 #include <rfb/HextileEncoder.h>
 #include <rfb/ZRLEEncoder.h>
 #include <rfb/TightEncoder.h>
+#include <rfb/SMsgWriter.h>
 
 using namespace rfb;
 
+Encoder::Encoder(SMsgWriter* writer_) : writer(writer_)
+{
+}
+
 Encoder::~Encoder()
 {
 }

common/rfb/Encoder.h

@@ -29,6 +29,7 @@ namespace rfb {
 
   class Encoder {
   public:
+    Encoder(SMsgWriter* writer);
     virtual ~Encoder();
 
     virtual void setCompressLevel(int level) {};
@@ -43,6 +44,9 @@ namespace rfb {
 
     static bool supported(int encoding);
     static Encoder* createEncoder(int encoding, SMsgWriter* writer);
+
+  protected:
+    SMsgWriter* writer;
   };
 }
 

common/rfb/HextileDecoder.cxx

@@ -34,7 +34,7 @@ using namespace rfb;
 #include <rfb/hextileDecode.h>
 #undef BPP
 
-HextileDecoder::HextileDecoder(CMsgReader* reader_) : reader(reader_)
+HextileDecoder::HextileDecoder(CMsgReader* reader) : Decoder(reader)
 {
 }
 

common/rfb/HextileDecoder.h

@@ -27,8 +27,6 @@ namespace rfb {
     HextileDecoder(CMsgReader* reader);
     virtual ~HextileDecoder();
     virtual void readRect(const Rect& r, CMsgHandler* handler);
-  private:
-    CMsgReader* reader;
   };
 }
 #endif

common/rfb/HextileEncoder.cxx

@@ -45,7 +45,7 @@ BoolParameter improvedHextile("ImprovedHextile",
 #include <rfb/hextileEncodeBetter.h>
 #undef BPP
 
-HextileEncoder::HextileEncoder(SMsgWriter* writer_) : writer(writer_)
+HextileEncoder::HextileEncoder(SMsgWriter* writer_) : Encoder(writer_)
 {
 }
 

common/rfb/HextileEncoder.h

@@ -27,8 +27,6 @@ namespace rfb {
     HextileEncoder(SMsgWriter* writer);
     virtual ~HextileEncoder();
     virtual void writeRect(const Rect& r, TransImageGetter* ig);
-  private:
-    SMsgWriter* writer;
   };
 }
 #endif

common/rfb/RREDecoder.cxx

@@ -34,7 +34,7 @@ using namespace rfb;
 #include <rfb/rreDecode.h>
 #undef BPP
 
-RREDecoder::RREDecoder(CMsgReader* reader_) : reader(reader_)
+RREDecoder::RREDecoder(CMsgReader* reader) : Decoder(reader)
 {
 }
 

common/rfb/RREDecoder.h

@@ -27,8 +27,6 @@ namespace rfb {
     RREDecoder(CMsgReader* reader);
     virtual ~RREDecoder();
     virtual void readRect(const Rect& r, CMsgHandler* handler);
-  private:
-    CMsgReader* reader;
   };
 }
 #endif

common/rfb/RREEncoder.cxx

@@ -33,7 +33,7 @@ using namespace rfb;
 #include <rfb/rreEncode.h>
 #undef BPP
 
-RREEncoder::RREEncoder(SMsgWriter* writer_) : writer(writer_)
+RREEncoder::RREEncoder(SMsgWriter* writer) : Encoder(writer)
 {
 }
 

common/rfb/RREEncoder.h

@@ -29,7 +29,6 @@ namespace rfb {
     virtual ~RREEncoder();
     virtual void writeRect(const Rect& r, TransImageGetter* ig);
   private:
-    SMsgWriter* writer;
     rdr::MemOutStream mos;
   };
 }

common/rfb/RawDecoder.cxx

@@ -22,7 +22,7 @@
 
 using namespace rfb;
 
-RawDecoder::RawDecoder(CMsgReader* reader_) : reader(reader_)
+RawDecoder::RawDecoder(CMsgReader* reader) : Decoder(reader)
 {
 }
 

common/rfb/RawDecoder.h

@@ -27,8 +27,6 @@ namespace rfb {
     RawDecoder(CMsgReader* reader);
     virtual ~RawDecoder();
     virtual void readRect(const Rect& r, CMsgHandler* handler);
-  private:
-    CMsgReader* reader;
   };
 }
 #endif

common/rfb/RawEncoder.cxx

@@ -23,7 +23,7 @@
 
 using namespace rfb;
 
-RawEncoder::RawEncoder(SMsgWriter* writer_) : writer(writer_)
+RawEncoder::RawEncoder(SMsgWriter* writer) : Encoder(writer)
 {
 }
 

common/rfb/RawEncoder.h

@@ -27,8 +27,6 @@ namespace rfb {
     RawEncoder(SMsgWriter* writer);
     virtual ~RawEncoder();
     virtual void writeRect(const Rect& r, TransImageGetter* ig);
-  private:
-    SMsgWriter* writer;
   };
 }
 #endif

common/rfb/TightDecoder.cxx

@@ -37,7 +37,7 @@ using namespace rfb;
 #include <rfb/tightDecode.h>
 #undef BPP
 
-TightDecoder::TightDecoder(CMsgReader* reader_) : reader(reader_)
+TightDecoder::TightDecoder(CMsgReader* reader) : Decoder(reader)
 {
 }
 

common/rfb/TightDecoder.h

@@ -54,7 +54,6 @@ namespace rfb {
     void directFillRect16(const Rect& r, Pixel pix);
     void directFillRect32(const Rect& r, Pixel pix);
 
-    CMsgReader* reader;
     CMsgHandler* handler;
     rdr::InStream* is;
     rdr::ZlibInStream zis[4];

common/rfb/TightEncoder.cxx

@@ -93,7 +93,7 @@ const int TightEncoder::defaultCompressLevel = 2;
 #include <rfb/tightEncode.h>
 #undef BPP
 
-TightEncoder::TightEncoder(SMsgWriter* writer_) : writer(writer_)
+TightEncoder::TightEncoder(SMsgWriter* writer) : Encoder(writer)
 {
   setCompressLevel(defaultCompressLevel);
   setQualityLevel(-1);

common/rfb/TightEncoder.h

@@ -142,7 +142,6 @@ namespace rfb {
     void encodeJpegRect32(rdr::U32 *buf, int stride, const Rect& r,
                           rdr::OutStream *os);
 
-    SMsgWriter* writer;
     rdr::MemOutStream mos;
     rdr::ZlibOutStream zos[4];
     JpegCompressor jc;

common/rfb/ZRLEDecoder.cxx

@@ -40,7 +40,7 @@ using namespace rfb;
 #undef CPIXEL
 #undef BPP
 
-ZRLEDecoder::ZRLEDecoder(CMsgReader* reader_) : reader(reader_)
+ZRLEDecoder::ZRLEDecoder(CMsgReader* reader) : Decoder(reader)
 {
 }
 

common/rfb/ZRLEDecoder.h

@@ -29,7 +29,6 @@ namespace rfb {
     virtual ~ZRLEDecoder();
     virtual void readRect(const Rect& r, CMsgHandler* handler);
   private:
-    CMsgReader* reader;
     rdr::ZlibInStream zis;
   };
 }

common/rfb/ZRLEEncoder.cxx

@@ -46,8 +46,8 @@ IntParameter zlibLevel("ZlibLevel","Zlib compression level",-1);
 #undef CPIXEL
 #undef BPP
 
-ZRLEEncoder::ZRLEEncoder(SMsgWriter* writer_)
-  : writer(writer_), zos(0,0,zlibLevel), mos(129*1024)
+ZRLEEncoder::ZRLEEncoder(SMsgWriter* writer)
+  : Encoder(writer), zos(0,0,zlibLevel), mos(129*1024)
 {
 }
 

common/rfb/ZRLEEncoder.h

@@ -30,7 +30,6 @@ namespace rfb {
     virtual ~ZRLEEncoder();
     virtual void writeRect(const Rect& r, TransImageGetter* ig);
   private:
-    SMsgWriter* writer;
     rdr::ZlibOutStream zos;
     rdr::MemOutStream mos;
   };