X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=40d06a1721493ab8105b13109c881ec37fd3b19c;hb=74a8d26a8907c6e00e29f054178a3425f44e38ed;hp=110bcc6a8de5dabbd3aa9a19110f60cb0b200403;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 110bcc6a8..40d06a172 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -36,11 +36,12 @@ class Filter;
 class SoundProcessor;
 class DCPContentType;
 class Ratio;
+class ColourConversion;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
  */
-class Config
+class Config : public boost::noncopyable
 {
 public:
 
@@ -61,18 +62,10 @@ public:
 	}
 
 	/** @return J2K encoding servers to use */
-	std::vector<ServerDescription*> servers () const {
+	std::vector<boost::shared_ptr<ServerDescription> > servers () const {
 		return _servers;
 	}
 
-	Scaler const * reference_scaler () const {
-		return _reference_scaler;
-	}
-
-	std::vector<Filter const *> reference_filters () const {
-		return _reference_filters;
-	}
-
 	/** @return The IP address of a TMS that we can copy DCPs to */
 	std::string tms_ip () const {
 		return _tms_ip;
@@ -126,6 +119,14 @@ public:
 		return _dcp_metadata;
 	}
 
+	int default_j2k_bandwidth () const {
+		return _default_j2k_bandwidth;
+	}
+
+	std::vector<boost::shared_ptr<ColourConversion> > colour_conversions () const {
+		return _colour_conversions;
+	}
+
 	/** @param n New number of local encoding threads */
 	void set_num_local_encoding_threads (int n) {
 		_num_local_encoding_threads = n;
@@ -141,7 +142,7 @@ public:
 	}
 
 	/** @param s New list of servers */
-	void set_servers (std::vector<ServerDescription*> s) {
+	void set_servers (std::vector<boost::shared_ptr<ServerDescription> > s) {
 		_servers = s;
 	}
 
@@ -204,6 +205,14 @@ public:
 	void set_dcp_metadata (libdcp::XMLMetadata m) {
 		_dcp_metadata = m;
 	}
+
+	void set_default_j2k_bandwidth (int b) {
+		_default_j2k_bandwidth = b;
+	}
+
+	void set_colour_conversions (std::vector<boost::shared_ptr<ColourConversion> > const & c) {
+		_colour_conversions = c;
+	}
 	
 	void write () const;
 
@@ -224,7 +233,7 @@ private:
 	int _server_port;
 
 	/** J2K encoding servers to use */
-	std::vector<ServerDescription *> _servers;
+	std::vector<boost::shared_ptr<ServerDescription> > _servers;
 	/** Scaler to use for the "A" part of A/B comparisons */
 	Scaler const * _reference_scaler;
 	/** Filters to use for the "A" part of A/B comparisons */
@@ -247,6 +256,8 @@ private:
 	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	libdcp::XMLMetadata _dcp_metadata;
+	int _default_j2k_bandwidth;
+	std::vector<boost::shared_ptr<ColourConversion> > _colour_conversions;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;