X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=5ae14ebda03384f8250f3ad12d4085fd4025aa62;hb=7d1c30d17b3494e07fd32dd34cd4806006e725dd;hp=23286ddb0164e62fcb8e122c6f9f36d483c72f08;hpb=2c35515c5db7b8e49c17fd4ddfa085393d544f9d;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 23286ddb0..5ae14ebda 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -78,6 +78,7 @@ public:
 		SOUND_OUTPUT,
 		INTERFACE_COMPLEXITY,
 		PLAYER_CONTENT_DIRECTORY,
+		PLAYER_PLAYLIST_DIRECTORY,
 		HISTORY,
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 		PLAYER_BACKGROUND_IMAGE,
@@ -483,8 +484,8 @@ public:
 		return _respect_kdm_validity_periods;
 	}
 
-	boost::optional<boost::filesystem::path> player_log_file () const {
-		return _player_log_file;
+	boost::optional<boost::filesystem::path> player_activity_log_file () const {
+		return _player_activity_log_file;
 	}
 
 	boost::optional<boost::filesystem::path> player_content_directory () const {
@@ -523,11 +524,11 @@ public:
 	std::vector<Monitor> required_monitors () const {
 		return _required_monitors;
 	}
-#endif
 
-	bool allow_spl_editing () const {
-		return _allow_spl_editing;
+	boost::optional<boost::filesystem::path> player_lock_file () const {
+		return _player_lock_file;
 	}
+#endif
 
 	/* SET (mostly) */
 
@@ -939,15 +940,15 @@ public:
 		maybe_set (_respect_kdm_validity_periods, r);
 	}
 
-	void set_player_log_file (boost::filesystem::path p) {
-		maybe_set (_player_log_file, p);
+	void set_player_activity_log_file (boost::filesystem::path p) {
+		maybe_set (_player_activity_log_file, p);
 	}
 
-	void unset_player_log_file () {
-		if (!_player_log_file) {
+	void unset_player_activity_log_file () {
+		if (!_player_activity_log_file) {
 			return;
 		}
-		_player_log_file = boost::none;
+		_player_activity_log_file = boost::none;
 		changed ();
 	}
 
@@ -964,7 +965,7 @@ public:
 	}
 
 	void set_player_playlist_directory (boost::filesystem::path p) {
-		maybe_set (_player_playlist_directory, p);
+		maybe_set (_player_playlist_directory, p, PLAYER_PLAYLIST_DIRECTORY);
 	}
 
 	void unset_player_playlist_directory () {
@@ -972,7 +973,7 @@ public:
 			return;
 		}
 		_player_playlist_directory = boost::none;
-		changed ();
+		changed (PLAYER_PLAYLIST_DIRECTORY);
 	}
 
 	void set_player_kdm_directory (boost::filesystem::path p) {
@@ -1019,12 +1020,20 @@ public:
 	void set_required_monitors (std::vector<Monitor> monitors) {
 		maybe_set (_required_monitors, monitors);
 	}
-#endif
 
-	void set_allow_spl_editing (bool s) {
-		maybe_set (_allow_spl_editing, s);
+	void set_player_lock_file (boost::filesystem::path p) {
+		maybe_set (_player_lock_file, p);
 	}
 
+	void unset_player_lock_file () {
+		if (!_player_lock_file) {
+			return;
+		}
+		_player_lock_file = boost::none;
+		changed ();
+	}
+#endif
+
 	void changed (Property p = OTHER);
 	boost::signals2::signal<void (Property)> Changed;
 	/** Emitted if read() failed on an existing Config file.  There is nothing
@@ -1119,6 +1128,7 @@ private:
 	std::string _tms_password;
 	/** Our cinema sound processor */
 	CinemaSoundProcessor const * _cinema_sound_processor;
+	/** The list of possible DCP frame rates that DCP-o-matic will use */
 	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;
@@ -1163,10 +1173,16 @@ private:
 	std::string _notification_bcc;
 	std::string _notification_email;
 	boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	boost::filesystem::path _signer_chain_path;
+#endif
 	/** Chain used to decrypt KDMs; the leaf of this chain is the target
 	 *  certificate for making KDMs given to DCP-o-matic.
 	 */
 	boost::shared_ptr<const dcp::CertificateChain> _decryption_chain;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	boost::filesystem::path _decryption_chain_path;
+#endif
 	/** true to check for updates on startup */
 	bool _check_for_updates;
 	bool _check_for_test_updates;
@@ -1211,7 +1227,10 @@ private:
 	PlayerMode _player_mode;
 	int _image_display;
 	bool _respect_kdm_validity_periods;
-	boost::optional<boost::filesystem::path> _player_log_file;
+	/** 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;
 	/** A directory containing DCPs whose contents are presented to the user
 	    in the dual-screen player mode.  DCPs on the list can be loaded
 	    for playback.
@@ -1228,8 +1247,9 @@ private:
 	/** watermark duration in milliseconds */
 	int _player_watermark_duration;
 	std::vector<Monitor> _required_monitors;
+	/** a file which, if specified, must be present for the player to work */
+	boost::optional<boost::filesystem::path> _player_lock_file;
 #endif
-	bool _allow_spl_editing;
 
 	static int const _current_version;