diff options
Diffstat (limited to 'common/rfb/Encoder.h')
-rw-r--r-- | common/rfb/Encoder.h | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/common/rfb/Encoder.h b/common/rfb/Encoder.h index da2c5c09..26d57963 100644 --- a/common/rfb/Encoder.h +++ b/common/rfb/Encoder.h @@ -1,5 +1,6 @@ /* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. * Copyright (C) 2011 D. R. Commander. All Rights Reserved. + * Copyright 2014 Pierre Ossman for Cendio AB * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,15 +21,11 @@ #define __RFB_ENCODER_H__ #include <rfb/Rect.h> -#include <rfb/encodings.h> #include <rfb/TransImageGetter.h> -#include <rfb/JpegCompressor.h> namespace rfb { class SMsgWriter; - class Encoder; - class ImageGetter; - typedef Encoder* (*EncoderCreateFnType)(SMsgWriter*); + class TransImageGetter; class Encoder { public: @@ -36,7 +33,7 @@ namespace rfb { virtual void setCompressLevel(int level) {}; virtual void setQualityLevel(int level) {}; - virtual void setFineQualityLevel(int quality, JPEG_SUBSAMP subsampling) {}; + virtual void setFineQualityLevel(int quality, int subsampling) {}; virtual int getNumRects(const Rect &r) { return 1; } // writeRect() tries to write the given rectangle. If it is unable to @@ -47,20 +44,7 @@ namespace rfb { static bool supported(int encoding); static Encoder* createEncoder(int encoding, SMsgWriter* writer); - static void registerEncoder(int encoding, - EncoderCreateFnType createFn); - static void unregisterEncoder(int encoding); - private: - static EncoderCreateFnType createFns[encodingMax+1]; }; - - class EncoderInit { - static int count; - public: - EncoderInit(); - }; - - static EncoderInit encoderInitObj; } #endif |