X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=68aae7414a009206f5984a46630f7a5b3c56895c;hp=91926750b8a9a44b37096c144756fe6dca65ff95;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hpb=f85101ff72bf93ab3546ea0c4ec8e3f1242f256f

diff --git a/src/lib/config.h b/src/lib/config.h
index 91926750b..68aae7414 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -27,17 +27,24 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
+#include <boost/filesystem.hpp>
+#include <dcp/metadata.h>
 #include "dci_metadata.h"
+#include "colour_conversion.h"
+#include "server.h"
 
 class ServerDescription;
 class Scaler;
 class Filter;
 class SoundProcessor;
+class DCPContentType;
+class Ratio;
+class Cinema;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
  */
-class Config
+class Config : public boost::noncopyable
 {
 public:
 
@@ -46,35 +53,42 @@ public:
 		return _num_local_encoding_threads;
 	}
 
-	std::string default_directory () const {
+	boost::filesystem::path default_directory () const {
 		return _default_directory;
 	}
 
-	std::string default_directory_or (std::string a) const;
+	boost::filesystem::path default_directory_or (boost::filesystem::path a) const;
 
-	/** @return port to use for J2K encoding servers */
-	int server_port () const {
-		return _server_port;
+	/** @return base port number to use for J2K encoding servers */
+	int server_port_base () const {
+		return _server_port_base;
 	}
 
-	/** @return J2K encoding servers to use */
-	std::vector<ServerDescription*> servers () const {
-		return _servers;
+	void set_use_any_servers (bool u) {
+		_use_any_servers = u;
+		write ();
+	}
+
+	bool use_any_servers () const {
+		return _use_any_servers;
 	}
 
-	Scaler const * reference_scaler () const {
-		return _reference_scaler;
+	/** @param s New list of servers */
+	void set_servers (std::vector<std::string> s) {
+		_servers = s;
+		write ();
 	}
 
-	std::vector<Filter const *> reference_filters () const {
-		return _reference_filters;
+	/** @return Host names / IP addresses of J2K encoding servers that should definitely be used */
+	std::vector<std::string> servers () const {
+		return _servers;
 	}
 
 	/** @return The IP address of a TMS that we can copy DCPs to */
 	std::string tms_ip () const {
 		return _tms_ip;
 	}
-
+	
 	/** @return The path on a TMS that we should write DCPs to */
 	std::string tms_path () const {
 		return _tms_path;
@@ -95,6 +109,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;
 	}
@@ -111,96 +129,222 @@ public:
 		return _default_still_length;
 	}
 
-	/** @param n New number of local encoding threads */
-	void set_num_local_encoding_threads (int n) {
-		_num_local_encoding_threads = n;
+	Ratio const * default_container () const {
+		return _default_container;
 	}
 
-	void set_default_directory (std::string d) {
-		_default_directory = d;
+	DCPContentType const * default_dcp_content_type () const {
+		return _default_dcp_content_type;
 	}
 
-	/** @param p New server port */
-	void set_server_port (int p) {
-		_server_port = p;
+	dcp::XMLMetadata dcp_metadata () const {
+		return _dcp_metadata;
 	}
 
-	/** @param s New list of servers */
-	void set_servers (std::vector<ServerDescription*> s) {
-		_servers = s;
+	int default_j2k_bandwidth () const {
+		return _default_j2k_bandwidth;
+	}
+
+	int default_audio_delay () const {
+		return _default_audio_delay;
 	}
 
-	void set_reference_scaler (Scaler const * s) {
-		_reference_scaler = s;
+	std::vector<PresetColourConversion> colour_conversions () const {
+		return _colour_conversions;
+	}
+
+	std::string mail_server () const {
+		return _mail_server;
+	}
+
+	std::string mail_user () const {
+		return _mail_user;
+	}
+
+	std::string mail_password () const {
+		return _mail_password;
+	}
+
+	std::string kdm_from () const {
+		return _kdm_from;
+	}
+
+	std::string kdm_email () const {
+		return _kdm_email;
+	}
+
+	bool check_for_updates () const {
+		return _check_for_updates;
+	}
+
+	bool check_for_test_updates () const {
+		return _check_for_test_updates;
 	}
 	
-	void set_reference_filters (std::vector<Filter const *> const & f) {
-		_reference_filters = f;
+	/** @param n New number of local encoding threads */
+	void set_num_local_encoding_threads (int n) {
+		_num_local_encoding_threads = n;
+		write ();
+	}
+
+	void set_default_directory (boost::filesystem::path d) {
+		_default_directory = d;
+		write ();
+	}
+
+	/** @param p New server port */
+	void set_server_port_base (int p) {
+		_server_port_base = p;
+		write ();
 	}
 
 	/** @param i IP address of a TMS that we can copy DCPs to */
 	void set_tms_ip (std::string i) {
 		_tms_ip = i;
+		write ();
 	}
 
 	/** @param p Path on a TMS that we should write DCPs to */
 	void set_tms_path (std::string p) {
 		_tms_path = p;
+		write ();
 	}
 
 	/** @param u User name to log into the TMS with */
 	void set_tms_user (std::string u) {
 		_tms_user = u;
+		write ();
 	}
 
 	/** @param p Password to log into the TMS with */
 	void set_tms_password (std::string p) {
 		_tms_password = p;
+		write ();
+	}
+
+	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;
+		write ();
 	}
 
 	void set_default_dci_metadata (DCIMetadata d) {
 		_default_dci_metadata = d;
+		write ();
 	}
 
 	void set_language (std::string l) {
 		_language = l;
+		write ();
 	}
 
 	void unset_language () {
 		_language = boost::none;
+		write ();
 	}
 
 	void set_default_still_length (int s) {
 		_default_still_length = s;
+		write ();
+	}
+
+	void set_default_container (Ratio const * c) {
+		_default_container = c;
+		write ();
+	}
+
+	void set_default_dcp_content_type (DCPContentType const * t) {
+		_default_dcp_content_type = t;
+		write ();
+	}
+
+	void set_dcp_metadata (dcp::XMLMetadata m) {
+		_dcp_metadata = m;
+		write ();
+	}
+
+	void set_default_j2k_bandwidth (int b) {
+		_default_j2k_bandwidth = b;
+		write ();
+	}
+
+	void set_default_audio_delay (int d) {
+		_default_audio_delay = d;
+		write ();
+	}
+
+	void set_colour_conversions (std::vector<PresetColourConversion> const & c) {
+		_colour_conversions = c;
+		write ();
+	}
+
+	void set_mail_server (std::string s) {
+		_mail_server = s;
+		write ();
+	}
+
+	void set_mail_user (std::string u) {
+		_mail_user = u;
+		write ();
+	}
+
+	void set_mail_password (std::string p) {
+		_mail_password = p;
+		write ();
 	}
 
+	void set_kdm_from (std::string f) {
+		_kdm_from = f;
+		write ();
+	}
+
+	void set_kdm_email (std::string e) {
+		_kdm_email = e;
+		write ();
+	}
+
+	void set_check_for_updates (bool c) {
+		_check_for_updates = c;
+		write ();
+	}
+
+	void set_check_for_test_updates (bool c) {
+		_check_for_test_updates = c;
+		write ();
+	}
+	
 	void write () const;
 
+	boost::filesystem::path signer_chain_directory () const;
+
 	static Config* instance ();
 	static void drop ();
 
 private:
 	Config ();
-	std::string file (bool) const;
+	boost::filesystem::path file (bool) const;
+	void read ();
 	void read_old_metadata ();
 
 	/** number of threads to use for J2K encoding on the local machine */
 	int _num_local_encoding_threads;
 	/** default directory to put new films in */
-	std::string _default_directory;
-	/** port to use for J2K encoding servers */
-	int _server_port;
-
-	/** J2K encoding servers to use */
-	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 */
-	std::vector<Filter const *> _reference_filters;
+	boost::filesystem::path _default_directory;
+	/** base port number to use for J2K encoding servers;
+	 *  this port and the one above it will be used.
+	 */
+	int _server_port_base;
+	/** true to broadcast on the `any' address to look for servers */
+	bool _use_any_servers;
+	/** J2K encoding servers that should definitely be used */
+	std::vector<std::string> _servers;
 	/** The IP address of a TMS that we can copy DCPs to */
 	std::string _tms_ip;
 	/** The path on a TMS that we should write DCPs to */
@@ -216,6 +360,21 @@ private:
 	DCIMetadata _default_dci_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
+	Ratio const * _default_container;
+	DCPContentType const * _default_dcp_content_type;
+	dcp::XMLMetadata _dcp_metadata;
+	int _default_j2k_bandwidth;
+	int _default_audio_delay;
+	std::vector<PresetColourConversion> _colour_conversions;
+	std::list<boost::shared_ptr<Cinema> > _cinemas;
+	std::string _mail_server;
+	std::string _mail_user;
+	std::string _mail_password;
+	std::string _kdm_from;
+	std::string _kdm_email;
+	/** true to check for updates on startup */
+	bool _check_for_updates;
+	bool _check_for_test_updates;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;