Split out ServerParams from ConnParams
We need to track different things in the server and client, so
separate things to two independent structures to keep things more
clear.
diff --git a/common/rfb/RawDecoder.cxx b/common/rfb/RawDecoder.cxx
index ec0c68e..6123504 100644
--- a/common/rfb/RawDecoder.cxx
+++ b/common/rfb/RawDecoder.cxx
@@ -19,7 +19,7 @@
#include <assert.h>
#include <rdr/OutStream.h>
-#include <rfb/ConnParams.h>
+#include <rfb/ServerParams.h>
#include <rfb/PixelBuffer.h>
#include <rfb/RawDecoder.h>
@@ -34,15 +34,15 @@
}
void RawDecoder::readRect(const Rect& r, rdr::InStream* is,
- const ConnParams& cp, rdr::OutStream* os)
+ const ServerParams& server, rdr::OutStream* os)
{
- os->copyBytes(is, r.area() * (cp.pf().bpp/8));
+ os->copyBytes(is, r.area() * (server.pf().bpp/8));
}
void RawDecoder::decodeRect(const Rect& r, const void* buffer,
- size_t buflen, const ConnParams& cp,
+ size_t buflen, const ServerParams& server,
ModifiablePixelBuffer* pb)
{
- assert(buflen >= (size_t)r.area() * (cp.pf().bpp/8));
- pb->imageRect(cp.pf(), r, buffer);
+ assert(buflen >= (size_t)r.area() * (server.pf().bpp/8));
+ pb->imageRect(server.pf(), r, buffer);
}