X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=48eabd54ca3dc33b6f395f34c8981256413ce9f0;hb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;hp=c43a4f079ef4b9753ebb02ea50ec2a2633f4758e;hpb=b9f6e9512017dc1ecd3a42aa1ef3c6058608cef5;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index c43a4f079..48eabd54c 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -29,18 +29,21 @@
 #include <boost/signals2.hpp>
 #include <libdcp/metadata.h>
 #include "dci_metadata.h"
+#include "colour_conversion.h"
+#include "server.h"
 
 class ServerDescription;
 class Scaler;
 class Filter;
 class SoundProcessor;
-class Container;
 class DCPContentType;
+class Ratio;
+class Cinema;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
  */
-class Config
+class Config : public boost::noncopyable
 {
 public:
 
@@ -61,18 +64,10 @@ public:
 	}
 
 	/** @return J2K encoding servers to use */
-	std::vector<ServerDescription*> servers () const {
+	std::vector<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;
@@ -98,6 +93,10 @@ public:
 		return _sound_processor;
 	}
 
+	std::list<boost::shared_ptr<Cinema> > cinemas () const {
+		return _cinemas;
+	}
+	
 	std::list<int> allowed_dcp_frame_rates () const {
 		return _allowed_dcp_frame_rates;
 	}
@@ -114,7 +113,7 @@ public:
 		return _default_still_length;
 	}
 
-	Container const * default_container () const {
+	Ratio const * default_container () const {
 		return _default_container;
 	}
 
@@ -126,6 +125,14 @@ public:
 		return _dcp_metadata;
 	}
 
+	int default_j2k_bandwidth () const {
+		return _default_j2k_bandwidth;
+	}
+
+	std::vector<PresetColourConversion> 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 +148,7 @@ public:
 	}
 
 	/** @param s New list of servers */
-	void set_servers (std::vector<ServerDescription*> s) {
+	void set_servers (std::vector<ServerDescription> s) {
 		_servers = s;
 	}
 
@@ -173,6 +180,14 @@ public:
 		_tms_password = p;
 	}
 
+	void add_cinema (boost::shared_ptr<Cinema> c) {
+		_cinemas.push_back (c);
+	}
+
+	void remove_cinema (boost::shared_ptr<Cinema> c) {
+		_cinemas.remove (c);
+	}
+
 	void set_allowed_dcp_frame_rates (std::list<int> const & r) {
 		_allowed_dcp_frame_rates = r;
 	}
@@ -193,8 +208,8 @@ public:
 		_default_still_length = s;
 	}
 
-	void set_default_container (Container const * f) {
-		_default_container = f;
+	void set_default_container (Ratio const * c) {
+		_default_container = c;
 	}
 
 	void set_default_dcp_content_type (DCPContentType const * t) {
@@ -204,9 +219,19 @@ 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<PresetColourConversion> const & c) {
+		_colour_conversions = c;
+	}
 	
 	void write () const;
 
+	std::string crypt_chain_directory () const;
+
 	static Config* instance ();
 	static void drop ();
 
@@ -224,7 +249,7 @@ private:
 	int _server_port;
 
 	/** J2K encoding servers to use */
-	std::vector<ServerDescription *> _servers;
+	std::vector<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 */
@@ -244,9 +269,13 @@ private:
 	DCIMetadata _default_dci_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
-	Container const * _default_container;
+	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	libdcp::XMLMetadata _dcp_metadata;
+	int _default_j2k_bandwidth;
+	std::vector<PresetColourConversion> _colour_conversions;
+
+	std::list<boost::shared_ptr<Cinema> > _cinemas;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;