X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=2f68ea31cb7b91cc5e085f78fee121400ae87ef8;hb=d2bd0c628fd0616fe3b7dd02bd955b2c07ab48d5;hp=0040591f165543c4b895c9171397aa91b7e95eaa;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 0040591f1..2f68ea31c 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,18 +25,13 @@
 #define DCPOMATIC_CONFIG_H
 
 #include "isdcf_metadata.h"
-#include "video_content.h"
-#include <dcp/metadata.h>
-#include <dcp/certificates.h>
-#include <dcp/signer.h>
+#include "types.h"
+#include <dcp/certificate_chain.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
 #include <vector>
 
-class ServerDescription;
-class Scaler;
-class Filter;
 class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
@@ -59,6 +54,12 @@ public:
 
 	boost::filesystem::path default_directory_or (boost::filesystem::path a) const;
 
+	enum Property {
+		USE_ANY_SERVERS,
+		SERVERS,
+		OTHER
+	};
+
 	/** @return base port number to use for J2K encoding servers */
 	int server_port_base () const {
 		return _server_port_base;
@@ -66,7 +67,7 @@ public:
 
 	void set_use_any_servers (bool u) {
 		_use_any_servers = u;
-		changed ();
+		changed (USE_ANY_SERVERS);
 	}
 
 	bool use_any_servers () const {
@@ -76,7 +77,7 @@ public:
 	/** @param s New list of servers */
 	void set_servers (std::vector<std::string> s) {
 		_servers = s;
-		changed ();
+		changed (SERVERS);
 	}
 
 	/** @return Host names / IP addresses of J2K encoding servers that should definitely be used */
@@ -84,6 +85,14 @@ public:
 		return _servers;
 	}
 
+	bool only_servers_encode () const {
+		return _only_servers_encode;
+	}
+
+	Protocol tms_protocol () const {
+		return _tms_protocol;
+	}
+
 	/** @return The IP address of a TMS that we can copy DCPs to */
 	std::string tms_ip () const {
 		return _tms_ip;
@@ -145,6 +154,10 @@ public:
 		return _dcp_issuer;
 	}
 
+	std::string dcp_creator () const {
+		return _dcp_creator;
+	}
+
 	int default_j2k_bandwidth () const {
 		return _default_j2k_bandwidth;
 	}
@@ -157,6 +170,10 @@ public:
 		return _mail_server;
 	}
 
+	int mail_port () const {
+		return _mail_port;
+	}
+
 	std::string mail_user () const {
 		return _mail_user;
 	}
@@ -185,16 +202,12 @@ public:
 		return _kdm_email;
 	}
 
-	boost::shared_ptr<const dcp::Signer> signer () const {
-		return _signer;
+	boost::shared_ptr<const dcp::CertificateChain> signer_chain () const {
+		return _signer_chain;
 	}
 
-	dcp::Certificate decryption_certificate () const {
-		return _decryption_certificate;
-	}
-
-	std::string decryption_private_key () const {
-		return _decryption_private_key;
+	boost::shared_ptr<const dcp::CertificateChain> decryption_chain () const {
+		return _decryption_chain;
 	}
 
 	bool check_for_updates () const {
@@ -213,6 +226,10 @@ public:
 		return _log_types;
 	}
 
+	bool automatic_audio_analysis () const {
+		return _automatic_audio_analysis;
+	}
+
 #ifdef DCPOMATIC_WINDOWS
 	bool win32_console () const {
 		return _win32_console;
@@ -237,6 +254,14 @@ public:
 		maybe_set (_server_port_base, p);
 	}
 
+	void set_only_servers_encode (bool o) {
+		maybe_set (_only_servers_encode, o);
+	}
+
+	void set_tms_protocol (Protocol p) {
+		maybe_set (_tms_protocol, p);
+	}
+
 	/** @param i IP address of a TMS that we can copy DCPs to */
 	void set_tms_ip (std::string i) {
 		maybe_set (_tms_ip, i);
@@ -312,6 +337,10 @@ public:
 		maybe_set (_dcp_issuer, i);
 	}
 
+	void set_dcp_creator (std::string c) {
+		maybe_set (_dcp_creator, c);
+	}
+
 	void set_default_j2k_bandwidth (int b) {
 		maybe_set (_default_j2k_bandwidth, b);
 	}
@@ -324,6 +353,10 @@ public:
 		maybe_set (_mail_server, s);
 	}
 
+	void set_mail_port (int p) {
+		maybe_set (_mail_port, p);
+	}
+
 	void set_mail_user (std::string u) {
 		maybe_set (_mail_user, u);
 	}
@@ -354,16 +387,12 @@ public:
 
 	void reset_kdm_email ();
 
-	void set_signer (boost::shared_ptr<const dcp::Signer> s) {
-		maybe_set (_signer, s);
-	}
-
-	void set_decryption_certificate (dcp::Certificate c) {
-		maybe_set (_decryption_certificate, c);
+	void set_signer_chain (boost::shared_ptr<const dcp::CertificateChain> s) {
+		maybe_set (_signer_chain, s);
 	}
 
-	void set_decryption_private_key (std::string k) {
-		maybe_set (_decryption_private_key, k);
+	void set_decryption_chain (boost::shared_ptr<const dcp::CertificateChain> c) {
+		maybe_set (_decryption_chain, c);
 	}
 
 	void set_check_for_updates (bool c) {
@@ -382,6 +411,10 @@ public:
 		maybe_set (_log_types, t);
 	}
 
+	void set_automatic_audio_analysis (bool a) {
+		maybe_set (_automatic_audio_analysis, a);
+	}
+
 #ifdef DCPOMATIC_WINDOWS
 	void set_win32_console (bool c) {
 		maybe_set (_win32_console, c);
@@ -395,20 +428,20 @@ public:
 
 	void add_to_history (boost::filesystem::path p);
 
-	void changed ();
-	boost::signals2::signal<void ()> Changed;
+	void changed (Property p = OTHER);
+	boost::signals2::signal<void (Property)> Changed;
 
 	void write () const;
 
 	static Config* instance ();
 	static void drop ();
 	static void restore_defaults ();
+	static bool have_existing ();
 
 private:
 	Config ();
-	boost::filesystem::path file () const;
+	static boost::filesystem::path file (bool create_directories = true);
 	void read ();
-	void make_decryption_keys ();
 	void set_defaults ();
 	void set_kdm_email_to_default ();
 
@@ -433,6 +466,8 @@ private:
 	bool _use_any_servers;
 	/** J2K encoding servers that should definitely be used */
 	std::vector<std::string> _servers;
+	bool _only_servers_encode;
+	Protocol _tms_protocol;
 	/** 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 */
@@ -454,10 +489,12 @@ private:
 	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	std::string _dcp_issuer;
+	std::string _dcp_creator;
 	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	std::list<boost::shared_ptr<Cinema> > _cinemas;
 	std::string _mail_server;
+	int _mail_port;
 	std::string _mail_user;
 	std::string _mail_password;
 	std::string _kdm_subject;
@@ -465,15 +502,18 @@ private:
 	std::string _kdm_cc;
 	std::string _kdm_bcc;
 	std::string _kdm_email;
-	boost::shared_ptr<const dcp::Signer> _signer;
-	dcp::Certificate _decryption_certificate;
-	std::string _decryption_private_key;
+	boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
+	/** Chain used to decrypt KDMs; the leaf of this chain is the target
+	 *  certificate for making KDMs given to DCP-o-matic.
+	 */
+	boost::shared_ptr<const dcp::CertificateChain> _decryption_chain;
 	/** true to check for updates on startup */
 	bool _check_for_updates;
 	bool _check_for_test_updates;
 	/** maximum allowed J2K bandwidth in bits per second */
 	int _maximum_j2k_bandwidth;
 	int _log_types;
+	bool _automatic_audio_analysis;
 #ifdef DCPOMATIC_WINDOWS
 	bool _win32_console;
 #endif