X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=55a172d78df40ed7c62025ff60c5422c7e9406fc;hb=391d85619ac19a2a93696ddc35c222eb9bb5d9d6;hp=310d3c6f5e2ca4624761c1b22ab44fa95e85ebc6;hpb=cc27c2716f755305d67f1e1ba828ecf37f8405dd;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 310d3c6f5..55a172d78 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -33,6 +33,7 @@
 #include <dcp/signer.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
+#include "video_content.h"
 
 class ServerDescription;
 class Scaler;
@@ -134,7 +135,7 @@ public:
 		return _default_still_length;
 	}
 
-	Ratio const * default_scale () const {
+	VideoContentScale default_scale () const {
 		return _default_scale;
 	}
 
@@ -146,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 {
@@ -221,7 +222,17 @@ public:
 	int log_types () const {
 		return _log_types;
 	}
-	
+
+#ifdef DCPOMATIC_WINDOWS	
+	bool win32_console () const {
+		return _win32_console;
+	}
+#endif	
+
+	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;
@@ -303,7 +314,7 @@ public:
 		changed ();
 	}
 
-	void set_default_scale (Ratio const * s) {
+	void set_default_scale (VideoContentScale s) {
 		_default_scale = s;
 		changed ();
 	}
@@ -318,8 +329,8 @@ public:
 		changed ();
 	}
 
-	void set_dcp_metadata (dcp::XMLMetadata m) {
-		_dcp_metadata = m;
+	void set_dcp_issuer (std::string i) {
+		_dcp_issuer = i;
 		changed ();
 	}
 
@@ -414,6 +425,20 @@ public:
 		_log_types = t;
 		changed ();
 	}
+
+#ifdef DCPOMATIC_WINDOWS	
+	void set_win32_console (bool c) {
+		_win32_console = c;
+		changed ();
+	}
+#endif	
+
+	void clear_history () {
+		_history.clear ();
+		changed ();
+	}
+
+	void add_to_history (boost::filesystem::path p);
 	
 	void changed ();
 	boost::signals2::signal<void ()> Changed;
@@ -423,9 +448,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;
@@ -456,10 +482,10 @@ private:
 	ISDCFMetadata _default_isdcf_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
-	Ratio const * _default_scale;
+	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;
@@ -481,7 +507,11 @@ private:
 	/** 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 */
 	static Config* _instance;
 };