X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=d8ac75beddd48e79fc98b3653d9f75f6c1b15c96;hb=5ea52a08f45b0cb8b8fe7221244cdcdeeaca0ed7;hp=671f53ef32dbcaf955f8109e6d46de6444ab8158;hpb=e7bc3bd16456c17bc6fe1d7981040b14e820505e;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 671f53ef3..d8ac75bed 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -28,15 +28,16 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/metadata.h>
+#include <dcp/metadata.h>
+#include <dcp/certificates.h>
+#include <dcp/signer.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
-#include "server.h"
 
 class ServerDescription;
 class Scaler;
 class Filter;
-class SoundProcessor;
+class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
 class Cinema;
@@ -104,9 +105,9 @@ public:
 		return _tms_password;
 	}
 
-	/** @return The sound processor that we are using */
-	SoundProcessor const * sound_processor () const {
-		return _sound_processor;
+	/** @return The cinema sound processor that we are using */
+	CinemaSoundProcessor const * cinema_sound_processor () const {
+		return _cinema_sound_processor;
 	}
 
 	std::list<boost::shared_ptr<Cinema> > cinemas () const {
@@ -133,6 +134,10 @@ public:
 		return _default_still_length;
 	}
 
+	Ratio const * default_scale () const {
+		return _default_scale;
+	}
+
 	Ratio const * default_container () const {
 		return _default_container;
 	}
@@ -141,7 +146,7 @@ public:
 		return _default_dcp_content_type;
 	}
 
-	libdcp::XMLMetadata dcp_metadata () const {
+	dcp::XMLMetadata dcp_metadata () const {
 		return _dcp_metadata;
 	}
 
@@ -169,14 +174,34 @@ public:
 		return _mail_password;
 	}
 
+	std::string kdm_subject () const {
+		return _kdm_subject;
+	}
+
 	std::string kdm_from () const {
 		return _kdm_from;
 	}
 
+	std::string kdm_cc () const {
+		return _kdm_cc;
+	}
+	
 	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;
 	}
@@ -274,6 +299,11 @@ public:
 		changed ();
 	}
 
+	void set_default_scale (Ratio const * s) {
+		_default_scale = s;
+		changed ();
+	}
+
 	void set_default_container (Ratio const * c) {
 		_default_container = c;
 		changed ();
@@ -284,7 +314,7 @@ public:
 		changed ();
 	}
 
-	void set_dcp_metadata (libdcp::XMLMetadata m) {
+	void set_dcp_metadata (dcp::XMLMetadata m) {
 		_dcp_metadata = m;
 		changed ();
 	}
@@ -319,16 +349,43 @@ public:
 		changed ();
 	}
 
+	void set_kdm_subject (std::string s) {
+		_kdm_subject = s;
+		changed ();
+	}
+
 	void set_kdm_from (std::string f) {
 		_kdm_from = f;
 		changed ();
 	}
 
+	void set_kdm_cc (std::string f) {
+		_kdm_cc = f;
+		changed ();
+	}
+	
 	void set_kdm_email (std::string e) {
 		_kdm_email = e;
 		changed ();
 	}
 
+	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 ();
@@ -349,8 +406,6 @@ public:
 		changed ();
 	}
 	
-	boost::filesystem::path signer_chain_directory () const;
-
 	void changed ();
 	boost::signals2::signal<void ()> Changed;
 
@@ -361,7 +416,6 @@ private:
 	Config ();
 	boost::filesystem::path file (bool) const;
 	void read ();
-	void read_old_metadata ();
 	void write () const;
 
 	/** number of threads to use for J2K encoding on the local machine */
@@ -384,8 +438,8 @@ private:
 	std::string _tms_user;
 	/** Password to log into the TMS with */
 	std::string _tms_password;
-	/** Our sound processor */
-	SoundProcessor const * _sound_processor;
+	/** Our cinema sound processor */
+	CinemaSoundProcessor const * _cinema_sound_processor;
 	std::list<int> _allowed_dcp_frame_rates;
 	/** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */
 	bool _allow_any_dcp_frame_rate;
@@ -393,9 +447,10 @@ private:
 	ISDCFMetadata _default_isdcf_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
+	Ratio const * _default_scale;
 	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
-	libdcp::XMLMetadata _dcp_metadata;
+	dcp::XMLMetadata _dcp_metadata;
 	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	std::vector<PresetColourConversion> _colour_conversions;
@@ -403,8 +458,13 @@ private:
 	std::string _mail_server;
 	std::string _mail_user;
 	std::string _mail_password;
+	std::string _kdm_subject;
 	std::string _kdm_from;
+	std::string _kdm_cc;
 	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;