1 files changed, 57 insertions, 11 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index 0639382a0..55a172d78 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -28,15 +28,17 @@
 #include <boost/shared_ptr.hpp>
 #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 "server.h"
 #include "video_content.h"
 
 class ServerDescription;
 class Scaler;
 class Filter;
-class SoundProcessor;
+class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
 class Cinema;
@@ -104,9 +106,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 {
@@ -193,6 +195,18 @@ public:
 		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;
 	}
@@ -209,6 +223,12 @@ public:
 		return _log_types;
 	}
 
+#ifdef DCPOMATIC_WINDOWS	
+	bool win32_console () const {
+		return _win32_console;
+	}
+#endif	
+
 	std::vector<boost::filesystem::path> history () const {
 		return _history;
 	}
@@ -371,6 +391,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 ();
@@ -391,6 +426,13 @@ public:
 		changed ();
 	}
 
+#ifdef DCPOMATIC_WINDOWS	
+	void set_win32_console (bool c) {
+		_win32_console = c;
+		changed ();
+	}
+#endif	
+
 	void clear_history () {
 		_history.clear ();
 		changed ();
@@ -398,8 +440,6 @@ public:
 
 	void add_to_history (boost::filesystem::path p);
 	
-	boost::filesystem::path signer_chain_directory () const;
-
 	void changed ();
 	boost::signals2::signal<void ()> Changed;
 
@@ -408,10 +448,10 @@ public:
 
 private:
 	Config ();
-	boost::filesystem::path file (bool) const;
+	boost::filesystem::path file () const;
 	void read ();
-	void read_old_metadata ();
 	void write () const;
+	void make_decryption_keys ();
 
 	/** number of threads to use for J2K encoding on the local machine */
 	int _num_local_encoding_threads;
@@ -433,8 +473,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;
@@ -458,12 +498,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;
 	/** 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;
+#ifdef DCPOMATIC_WINDOWS	
+	bool _win32_console;
+#endif	
 	std::vector<boost::filesystem::path> _history;
 	
 	/** Singleton instance, or 0 */