X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=be4e6ecf13814ac01adb54916efe3b9c4d976d1f;hb=cde563eea0cc9291f2c5eb5205a23723cce010f3;hp=1662671249209ec4abc60ce070351de6bdcb8da3;hpb=29f84e2b8785585885e0658bdf9938967547460f;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 166267124..be4e6ecf1 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -220,6 +220,10 @@ public:
 		return _default_interop;
 	}
 
+	std::map<std::string, std::string> default_metadata () const {
+		return _default_metadata;
+	}
+
 	bool upload_after_make_dcp () {
 		return _upload_after_make_dcp;
 	}
@@ -393,11 +397,12 @@ public:
 		NAG_DKDM_CONFIG,
 		NAG_ENCRYPTED_METADATA,
 		NAG_ALTER_DECRYPTION_CHAIN,
-		NAG_BAD_SIGNER_CHAIN,
+		NAG_BAD_SIGNER_CHAIN_UTF8,
 		NAG_IMPORT_DECRYPTION_CHAIN,
 		NAG_DELETE_DKDM,
 		NAG_32_ON_64,
 		NAG_TOO_MANY_DROPPED_FRAMES,
+		NAG_BAD_SIGNER_CHAIN_VALIDITY,
 		NAG_COUNT
 	};
 
@@ -513,10 +518,6 @@ public:
 		return _respect_kdm_validity_periods;
 	}
 
-	boost::optional<boost::filesystem::path> player_activity_log_file () const {
-		return _player_activity_log_file;
-	}
-
 	boost::optional<boost::filesystem::path> player_debug_log_file () const {
 		return _player_debug_log_file;
 	}
@@ -539,6 +540,10 @@ public:
 		return _custom_languages;
 	}
 
+	boost::optional<boost::filesystem::path> add_files_path () const {
+		return _add_files_path;
+	}
+
 	/* SET (mostly) */
 
 	void set_master_encoding_threads (int n) {
@@ -695,6 +700,10 @@ public:
 		maybe_set (_default_interop, i);
 	}
 
+	void set_default_metadata (std::map<std::string, std::string> const& metadata) {
+		maybe_set (_default_metadata, metadata);
+	}
+
 	void set_upload_after_make_dcp (bool u) {
 		maybe_set (_upload_after_make_dcp, u);
 	}
@@ -815,8 +824,6 @@ public:
 
 	void set_cinemas_file (boost::filesystem::path file);
 
-	void set_dkdm_recipients_file (boost::filesystem::path file);
-
 	void set_show_hints_before_make_dcp (bool s) {
 		maybe_set (_show_hints_before_make_dcp, s);
 	}
@@ -983,18 +990,6 @@ public:
 		maybe_set (_respect_kdm_validity_periods, r);
 	}
 
-	void set_player_activity_log_file (boost::filesystem::path p) {
-		maybe_set (_player_activity_log_file, p);
-	}
-
-	void unset_player_activity_log_file () {
-		if (!_player_activity_log_file) {
-			return;
-		}
-		_player_activity_log_file = boost::none;
-		changed ();
-	}
-
 	void set_player_debug_log_file (boost::filesystem::path p) {
 		maybe_set (_player_debug_log_file, p, PLAYER_DEBUG_LOG);
 	}
@@ -1048,6 +1043,11 @@ public:
 
 	void add_custom_language (dcp::LanguageTag tag);
 
+	void set_add_files_path (boost::filesystem::path p) {
+		_add_files_path = p;
+		changed ();
+	}
+
 	void changed (Property p = OTHER);
 	boost::signals2::signal<void (Property)> Changed;
 	/** Emitted if read() failed on an existing Config file.  There is nothing
@@ -1060,9 +1060,10 @@ public:
 	 *  true to ask Config to solve the problem (by discarding and recreating the bad thing)
 	 */
 	enum BadReason {
-		BAD_SIGNER_UTF8_STRINGS,     ///< signer chain contains UTF-8 strings (not PRINTABLESTRING)
-		BAD_SIGNER_INCONSISTENT,     ///< signer chain is somehow inconsistent
-		BAD_DECRYPTION_INCONSISTENT, ///< KDM decryption chain is somehow inconsistent
+		BAD_SIGNER_UTF8_STRINGS,      ///< signer chain contains UTF-8 strings (not PRINTABLESTRING)
+		BAD_SIGNER_INCONSISTENT,      ///< signer chain is somehow inconsistent
+		BAD_DECRYPTION_INCONSISTENT,  ///< KDM decryption chain is somehow inconsistent
+		BAD_SIGNER_VALIDITY_TOO_LONG, ///< signer certificate validity periods are >10 years
 	};
 
 	static boost::signals2::signal<bool (BadReason)> Bad;
@@ -1078,7 +1079,8 @@ public:
 	void save_template (std::shared_ptr<const Film> film, std::string name) const;
 	bool existing_template (std::string name) const;
 	std::list<std::string> templates () const;
-	boost::filesystem::path template_path (std::string name) const;
+	boost::filesystem::path template_read_path (std::string name) const;
+	boost::filesystem::path template_write_path (std::string name) const;
 	void rename_template (std::string old_name, std::string new_name) const;
 	void delete_template (std::string name) const;
 
@@ -1086,7 +1088,8 @@ public:
 	static void drop ();
 	static void restore_defaults ();
 	static bool have_existing (std::string);
-	static boost::filesystem::path config_file ();
+	static boost::filesystem::path config_read_file ();
+	static boost::filesystem::path config_write_file ();
 
 private:
 	Config ();
@@ -1171,6 +1174,7 @@ private:
 	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	bool _default_interop;
+	std::map<std::string, std::string> _default_metadata;
 	/** Default directory to offer to write KDMs to; if it's not set,
 	    the home directory will be offered.
 	*/
@@ -1245,10 +1249,6 @@ private:
 	int _image_display;
 	VideoViewType _video_view_type;
 	bool _respect_kdm_validity_periods;
-	/** Log file containing things the player does (e.g. started, stopped, loaded
-	    playlist etc.)  Does not contain debugging information.
-	*/
-	boost::optional<boost::filesystem::path> _player_activity_log_file;
 	/** Log file containing debug information for the player */
 	boost::optional<boost::filesystem::path> _player_debug_log_file;
 	/** A directory containing DCPs whose contents are presented to the user
@@ -1260,6 +1260,7 @@ private:
 	boost::optional<boost::filesystem::path> _player_kdm_directory;
 	boost::optional<AudioMapping> _audio_mapping;
 	std::vector<dcp::LanguageTag> _custom_languages;
+	boost::optional<boost::filesystem::path> _add_files_path;
 
 	static int const _current_version;