X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=3cc7c49c463950f8300fac0085266ae9b6df8fad;hb=e80e6a8567dd107f5ea3b708975cb5fd92112a57;hp=66ff662142133b6e4258b49c745b93759430252f;hpb=fc56dc97103d00437843a31e1ef0c4915900ad1a;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 66ff66214..3cc7c49c4 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -29,8 +29,11 @@
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
 #include <dcp/metadata.h>
+#include <dcp/certificates.h>
+#include <dcp/signer.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
+#include "video_content.h"
 
 class ServerDescription;
 class Scaler;
@@ -132,6 +135,10 @@ public:
 		return _default_still_length;
 	}
 
+	VideoContentScale default_scale () const {
+		return _default_scale;
+	}
+
 	Ratio const * default_container () const {
 		return _default_container;
 	}
@@ -140,8 +147,8 @@ public:
 		return _default_dcp_content_type;
 	}
 
-	dcp::XMLMetadata dcp_metadata () const {
-		return _dcp_metadata;
+	std::string dcp_issuer () const {
+		return _dcp_issuer;
 	}
 
 	int default_j2k_bandwidth () const {
@@ -179,11 +186,27 @@ public:
 	std::string kdm_cc () const {
 		return _kdm_cc;
 	}
+
+	std::string kdm_bcc () const {
+		return _kdm_bcc;
+	}
 	
 	std::string kdm_email () const {
 		return _kdm_email;
 	}
 
+	boost::shared_ptr<const dcp::Signer> signer () const {
+		return _signer;
+	}
+
+	dcp::Certificate decryption_certificate () const {
+		return _decryption_certificate;
+	}
+
+	std::string decryption_private_key () const {
+		return _decryption_private_key;
+	}
+
 	bool check_for_updates () const {
 		return _check_for_updates;
 	}
@@ -199,7 +222,11 @@ public:
 	int log_types () const {
 		return _log_types;
 	}
-	
+
+	std::vector<boost::filesystem::path> history () const {
+		return _history;
+	}
+
 	/** @param n New number of local encoding threads */
 	void set_num_local_encoding_threads (int n) {
 		_num_local_encoding_threads = n;
@@ -281,6 +308,11 @@ public:
 		changed ();
 	}
 
+	void set_default_scale (VideoContentScale s) {
+		_default_scale = s;
+		changed ();
+	}
+
 	void set_default_container (Ratio const * c) {
 		_default_container = c;
 		changed ();
@@ -291,8 +323,8 @@ public:
 		changed ();
 	}
 
-	void set_dcp_metadata (dcp::XMLMetadata m) {
-		_dcp_metadata = m;
+	void set_dcp_issuer (std::string i) {
+		_dcp_issuer = i;
 		changed ();
 	}
 
@@ -340,6 +372,11 @@ public:
 		_kdm_cc = f;
 		changed ();
 	}
+
+	void set_kdm_bcc (std::string f) {
+		_kdm_bcc = f;
+		changed ();
+	}
 	
 	void set_kdm_email (std::string e) {
 		_kdm_email = e;
@@ -348,6 +385,21 @@ public:
 
 	void reset_kdm_email ();
 
+	void set_signer (boost::shared_ptr<const dcp::Signer> s) {
+		_signer = s;
+		changed ();
+	}
+
+	void set_decryption_certificate (dcp::Certificate c) {
+		_decryption_certificate = c;
+		changed ();
+	}
+
+	void set_decryption_private_key (std::string k) {
+		_decryption_private_key = k;
+		changed ();
+	}
+
 	void set_check_for_updates (bool c) {
 		_check_for_updates = c;
 		changed ();
@@ -367,9 +419,14 @@ public:
 		_log_types = t;
 		changed ();
 	}
-	
-	boost::filesystem::path signer_chain_directory () const;
 
+	void clear_history () {
+		_history.clear ();
+		changed ();
+	}
+
+	void add_to_history (boost::filesystem::path p);
+	
 	void changed ();
 	boost::signals2::signal<void ()> Changed;
 
@@ -378,9 +435,10 @@ public:
 
 private:
 	Config ();
-	boost::filesystem::path file (bool) const;
+	boost::filesystem::path file () const;
 	void read ();
 	void write () const;
+	void make_decryption_keys ();
 
 	/** number of threads to use for J2K encoding on the local machine */
 	int _num_local_encoding_threads;
@@ -411,9 +469,10 @@ private:
 	ISDCFMetadata _default_isdcf_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
+	VideoContentScale _default_scale;
 	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
-	dcp::XMLMetadata _dcp_metadata;
+	std::string _dcp_issuer;
 	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	std::vector<PresetColourConversion> _colour_conversions;
@@ -424,14 +483,19 @@ private:
 	std::string _kdm_subject;
 	std::string _kdm_from;
 	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;
 	/** 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;
-
+	std::vector<boost::filesystem::path> _history;
+	
 	/** Singleton instance, or 0 */
 	static Config* _instance;
 };