X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=04f521575b23b3553b5024faf53f3465fda99e39;hb=be3ec98436ca28554d9414f5d5a2e3fa18846f3d;hp=c8ae32efd7bf02de3c66c252a971044b4722df49;hpb=234bca29f70aeeba4fffd67f987de876ff89b6cc;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index c8ae32efd..04f521575 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -76,6 +76,7 @@ public:
 		SOUND,
 		SOUND_OUTPUT,
 		INTERFACE_COMPLEXITY,
+		PLAYER_DCP_DIRECTORY,
 		OTHER
 	};
 
@@ -469,10 +470,32 @@ public:
 		return _player_mode;
 	}
 
+	int image_display () const {
+		return _image_display;
+	}
+
 	bool respect_kdm_validity_periods () const {
 		return _respect_kdm_validity_periods;
 	}
 
+	boost::optional<boost::filesystem::path> player_log_file () const {
+		return _player_log_file;
+	}
+
+	boost::optional<boost::filesystem::path> player_dcp_directory () const {
+		return _player_dcp_directory;
+	}
+
+	boost::optional<boost::filesystem::path> player_kdm_directory () const {
+		return _player_kdm_directory;
+	}
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	boost::optional<boost::filesystem::path> player_background_image () const {
+		return _player_background_image;
+	}
+#endif
+
 	/* SET (mostly) */
 
 	void set_master_encoding_threads (int n) {
@@ -875,10 +898,64 @@ public:
 		maybe_set (_player_mode, m);
 	}
 
+	void set_image_display (int n) {
+		maybe_set (_image_display, n);
+	}
+
 	void set_respect_kdm_validity_periods (bool r) {
 		maybe_set (_respect_kdm_validity_periods, r);
 	}
 
+	void set_player_log_file (boost::filesystem::path p) {
+		maybe_set (_player_log_file, p);
+	}
+
+	void unset_player_log_file () {
+		if (!_player_log_file) {
+			return;
+		}
+		_player_log_file = boost::none;
+		changed ();
+	}
+
+	void set_player_dcp_directory (boost::filesystem::path p) {
+		maybe_set (_player_dcp_directory, p, PLAYER_DCP_DIRECTORY);
+	}
+
+	void unset_player_dcp_directory () {
+		if (!_player_dcp_directory) {
+			return;
+		}
+		_player_dcp_directory = boost::none;
+		changed (PLAYER_DCP_DIRECTORY);
+	}
+
+	void set_player_kdm_directory (boost::filesystem::path p) {
+		maybe_set (_player_kdm_directory, p);
+	}
+
+	void unset_player_kdm_directory () {
+		if (!_player_kdm_directory) {
+			return;
+		}
+		_player_kdm_directory = boost::none;
+		changed ();
+	}
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	void set_player_background_image (boost::filesystem::path p) {
+		maybe_set (_player_background_image, p);
+	}
+
+	void unset_player_background_image () {
+		if (!_player_background_image) {
+			return;
+		}
+		_player_background_image = 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
@@ -1062,7 +1139,18 @@ private:
 	boost::optional<std::string> _gdc_password;
 	Interface _interface_complexity;
 	PlayerMode _player_mode;
+	int _image_display;
 	bool _respect_kdm_validity_periods;
+	boost::optional<boost::filesystem::path> _player_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.
+	*/
+	boost::optional<boost::filesystem::path> _player_dcp_directory;
+	boost::optional<boost::filesystem::path> _player_kdm_directory;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	boost::optional<boost::filesystem::path> _player_background_image;
+#endif
 
 	static int const _current_version;