Merge master.

1 files changed, 0 insertions, 29 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index 785fff137..ee4e4eaec 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -57,19 +57,6 @@ public:
 		return _server_port;
 	}
 
-	/** @return index of colour LUT to use when converting RGB to XYZ.
-	 *  0: sRGB
-	 *  1: Rec 709
-	 */
-	int colour_lut_index () const {
-		return _colour_lut_index;
-	}
-
-	/** @return bandwidth for J2K files in bits per second */
-	int j2k_bandwidth () const {
-		return _j2k_bandwidth;
-	}
-
 	/** @return J2K encoding servers to use */
 	std::vector<ServerDescription*> servers () const {
 		return _servers;
@@ -126,16 +113,6 @@ public:
 		_server_port = p;
 	}
 
-	/** @param i New colour LUT index */
-	void set_colour_lut_index (int i) {
-		_colour_lut_index = i;
-	}
-
-	/** @param b New J2K bandwidth */
-	void set_j2k_bandwidth (int b) {
-		_j2k_bandwidth = b;
-	}
-
 	/** @param s New list of servers */
 	void set_servers (std::vector<ServerDescription*> s) {
 		_servers = s;
@@ -194,12 +171,6 @@ private:
 	std::string _default_directory;
 	/** port to use for J2K encoding servers */
 	int _server_port;
-	/** index of colour LUT to use when converting RGB to XYZ
-	 *  (see colour_lut_index ())
-	 */
-	int _colour_lut_index;
-	/** bandwidth for J2K files in bits per second */
-	int _j2k_bandwidth;
 
 	/** J2K encoding servers to use */
 	std::vector<ServerDescription *> _servers;