Simplify encoding list generator
Tight is the default preferred encoding, so we don't really need
special handling for it to be first in the list.
diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx
index b74f2e7..6bb824d 100644
--- a/common/rfb/CConnection.cxx
+++ b/common/rfb/CConnection.cxx
@@ -595,37 +595,9 @@
encodings.push_back(encodingCopyRect);
- /*
- * Prefer encodings in this order:
- *
- * Tight, ZRLE, Hextile, *
- */
-
- if ((preferredEncoding != encodingTight) &&
- Decoder::supported(encodingTight))
- encodings.push_back(encodingTight);
-
- if ((preferredEncoding != encodingZRLE) &&
- Decoder::supported(encodingZRLE))
- encodings.push_back(encodingZRLE);
-
- if ((preferredEncoding != encodingHextile) &&
- Decoder::supported(encodingHextile))
- encodings.push_back(encodingHextile);
-
- // Remaining encodings
for (int i = encodingMax; i >= 0; i--) {
- switch (i) {
- case encodingCopyRect:
- case encodingTight:
- case encodingZRLE:
- case encodingHextile:
- /* These have already been sent earlier */
- break;
- default:
- if ((i != preferredEncoding) && Decoder::supported(i))
- encodings.push_back(i);
- }
+ if ((i != preferredEncoding) && Decoder::supported(i))
+ encodings.push_back(i);
}
if (server.compressLevel >= 0 && server.compressLevel <= 9)