X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=d9f104c7dec1a9c33cb29b0310ffc6c386367be4;hb=74fe68e5895654e27a7cf8097917c1e95fa89519;hp=a40e3680aace969bcf3fcfaa00d8dc206bbdc18a;hpb=604ef9902b6b2256adea97a20195cdb68b3a4aa6;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index a40e3680a..d9f104c7d 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -28,10 +28,9 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/metadata.h>
-#include "dci_metadata.h"
+#include <dcp/metadata.h>
+#include "isdcf_metadata.h"
 #include "colour_conversion.h"
-#include "server.h"
 
 class ServerDescription;
 class Scaler;
@@ -116,9 +115,13 @@ public:
 	std::list<int> allowed_dcp_frame_rates () const {
 		return _allowed_dcp_frame_rates;
 	}
+
+	bool allow_any_dcp_frame_rate () const {
+		return _allow_any_dcp_frame_rate;
+	}
 	
-	DCIMetadata default_dci_metadata () const {
-		return _default_dci_metadata;
+	ISDCFMetadata default_isdcf_metadata () const {
+		return _default_isdcf_metadata;
 	}
 
 	boost::optional<std::string> language () const {
@@ -137,7 +140,7 @@ public:
 		return _default_dcp_content_type;
 	}
 
-	libdcp::XMLMetadata dcp_metadata () const {
+	dcp::XMLMetadata dcp_metadata () const {
 		return _dcp_metadata;
 	}
 
@@ -169,6 +172,10 @@ public:
 		return _kdm_from;
 	}
 
+	std::string kdm_cc () const {
+		return _kdm_cc;
+	}
+	
 	std::string kdm_email () const {
 		return _kdm_email;
 	}
@@ -184,6 +191,10 @@ public:
 	int maximum_j2k_bandwidth () const {
 		return _maximum_j2k_bandwidth;
 	}
+
+	int log_types () const {
+		return _log_types;
+	}
 	
 	/** @param n New number of local encoding threads */
 	void set_num_local_encoding_threads (int n) {
@@ -241,8 +252,13 @@ public:
 		changed ();
 	}
 
-	void set_default_dci_metadata (DCIMetadata d) {
-		_default_dci_metadata = d;
+	void set_allow_any_dcp_frame_rate (bool a) {
+		_allow_any_dcp_frame_rate = a;
+		changed ();
+	}
+
+	void set_default_isdcf_metadata (ISDCFMetadata d) {
+		_default_isdcf_metadata = d;
 		changed ();
 	}
 
@@ -271,7 +287,7 @@ public:
 		changed ();
 	}
 
-	void set_dcp_metadata (libdcp::XMLMetadata m) {
+	void set_dcp_metadata (dcp::XMLMetadata m) {
 		_dcp_metadata = m;
 		changed ();
 	}
@@ -311,11 +327,18 @@ public:
 		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_check_for_updates (bool c) {
 		_check_for_updates = c;
 		changed ();
@@ -330,6 +353,11 @@ public:
 		_maximum_j2k_bandwidth = b;
 		changed ();
 	}
+
+	void set_log_types (int t) {
+		_log_types = t;
+		changed ();
+	}
 	
 	boost::filesystem::path signer_chain_directory () const;
 
@@ -369,13 +397,15 @@ private:
 	/** Our sound processor */
 	SoundProcessor const * _sound_processor;
 	std::list<int> _allowed_dcp_frame_rates;
-	/** Default DCI metadata for newly-created Films */
-	DCIMetadata _default_dci_metadata;
+	/** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */
+	bool _allow_any_dcp_frame_rate;
+	/** Default ISDCF metadata for newly-created Films */
+	ISDCFMetadata _default_isdcf_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
 	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;
@@ -384,12 +414,14 @@ private:
 	std::string _mail_user;
 	std::string _mail_password;
 	std::string _kdm_from;
+	std::string _kdm_cc;
 	std::string _kdm_email;
 	/** 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;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;