Remove magic JPEG variables from ConnParams
Custom compression level and JPEG on/off are not inherent parts of
the protocol negotiation so they do not belong in ConnParams. Let the
UI frontend handle such things instead.
diff --git a/common/rfb/CMsgWriter.cxx b/common/rfb/CMsgWriter.cxx
index 0ebd33e..9ee7a02 100644
--- a/common/rfb/CMsgWriter.cxx
+++ b/common/rfb/CMsgWriter.cxx
@@ -114,9 +114,9 @@
}
}
- if (cp->customCompressLevel && cp->compressLevel >= 0 && cp->compressLevel <= 9)
+ if (cp->compressLevel >= 0 && cp->compressLevel <= 9)
encodings[nEncodings++] = pseudoEncodingCompressLevel0 + cp->compressLevel;
- if (!cp->noJpeg && cp->qualityLevel >= 0 && cp->qualityLevel <= 9)
+ if (cp->qualityLevel >= 0 && cp->qualityLevel <= 9)
encodings[nEncodings++] = pseudoEncodingQualityLevel0 + cp->qualityLevel;
writeSetEncodings(nEncodings, encodings);
diff --git a/common/rfb/ConnParams.cxx b/common/rfb/ConnParams.cxx
index be9d48c..6fd6668 100644
--- a/common/rfb/ConnParams.cxx
+++ b/common/rfb/ConnParams.cxx
@@ -36,8 +36,7 @@
supportsDesktopRename(false), supportsLastRect(false),
supportsSetDesktopSize(false), supportsFence(false),
supportsContinuousUpdates(false),
- customCompressLevel(false), compressLevel(2),
- noJpeg(false), qualityLevel(-1), fineQualityLevel(-1),
+ compressLevel(2), qualityLevel(-1), fineQualityLevel(-1),
subsampling(subsampleUndefined), name_(0),
currentEncoding_(encodingRaw), verStrPos(0)
{
@@ -95,9 +94,7 @@
supportsExtendedDesktopSize = false;
supportsLocalXCursor = false;
supportsLastRect = false;
- customCompressLevel = false;
compressLevel = -1;
- noJpeg = true;
qualityLevel = -1;
fineQualityLevel = -1;
subsampling = subsampleUndefined;
@@ -167,10 +164,4 @@
if (Encoder::supported(encodings[i]))
currentEncoding_ = encodings[i];
}
-
- if (compressLevel != -1)
- customCompressLevel = true;
- if ((qualityLevel != -1) || (fineQualityLevel != -1) ||
- (subsampling != subsampleUndefined))
- noJpeg = false;
}
diff --git a/common/rfb/ConnParams.h b/common/rfb/ConnParams.h
index 68e2075..43267ff 100644
--- a/common/rfb/ConnParams.h
+++ b/common/rfb/ConnParams.h
@@ -91,9 +91,7 @@
bool supportsFence;
bool supportsContinuousUpdates;
- bool customCompressLevel;
int compressLevel;
- bool noJpeg;
int qualityLevel;
int fineQualityLevel;
int subsampling;