X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=e01eab780e8c9ce4dfabd2aee89caa7675d1845e;hb=c5a9590a9a84eb4eee8536dfa1eef59d7126eeac;hp=5981e799488f0a1dd7ad8a3b2a4a1d13c1d91983;hpb=ccacce39c39d16977ab6c1592fcb6e941b05ddff;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 5981e7994..e01eab780 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -397,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
 	};
 
@@ -517,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;
 	}
@@ -827,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);
 	}
@@ -995,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);
 	}
@@ -1077,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;
@@ -1100,6 +1084,8 @@ public:
 	void rename_template (std::string old_name, std::string new_name) const;
 	void delete_template (std::string name) const;
 
+	boost::optional<BadReason> check_certificates () const;
+
 	static Config* instance ();
 	static void drop ();
 	static void restore_defaults ();
@@ -1265,10 +1251,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