aboutsummaryrefslogtreecommitdiffstats
path: root/vncviewer/CConn.h
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2015-11-09 16:34:54 +0100
committerPierre Ossman <ossman@cendio.se>2015-11-27 10:56:26 +0100
commit9f273e9cd806288a37d1aae2d9f9ddae7262b8e5 (patch)
tree606123fc1b4a41eb740ec6750404aa41aa483182 /vncviewer/CConn.h
parent0068a4f5faa309b1f5e49dbf37d49f72db806cb4 (diff)
downloadtigervnc-9f273e9cd806288a37d1aae2d9f9ddae7262b8e5.tar.gz
tigervnc-9f273e9cd806288a37d1aae2d9f9ddae7262b8e5.zip
Delegate decoder object management to a separate class
Done in preparation for multi-core decoding. Keeps the complexity out of the other classes. This also moves ownership of the framebuffer in to CConnection. It's the CConnection object that is aware of the threads and how to synchronise with them. Therefore the ownership of the framebuffer must also be there to make sure it isn't deleted whilst threads are working.
Diffstat (limited to 'vncviewer/CConn.h')
-rw-r--r--vncviewer/CConn.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/vncviewer/CConn.h b/vncviewer/CConn.h
index 06e3040c..c934f3da 100644
--- a/vncviewer/CConn.h
+++ b/vncviewer/CConn.h
@@ -23,10 +23,9 @@
#include <FL/Fl.H>
#include <rfb/CConnection.h>
-#include <rfb/encodings.h>
-#include <network/Socket.h>
+#include <rdr/FdInStream.h>
-namespace rfb { class Decoder; }
+namespace network { class Socket; }
class DesktopWindow;
@@ -96,8 +95,6 @@ private:
bool pendingPFChange;
rfb::PixelFormat pendingPF;
- rfb::Decoder *decoders[rfb::encodingMax+1];
-
int currentEncoding, lastServerEncoding;
bool formatChange;