X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=a162750febf9cd59a12cc02e28b075c3b8098e32;hb=e477bee9f3548641f78395cb4b2751751b14c085;hp=8bf766c021a151d36e6b995a231a509e595efb1e;hpb=f8acc34bcb4401184064598353d6c54df3cab1f9;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 8bf766c02..a162750fe 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -27,6 +27,7 @@
 
 #include "isdcf_metadata.h"
 #include "types.h"
+#include "edid.h"
 #include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
@@ -75,6 +76,13 @@ public:
 		CINEMAS,
 		SOUND,
 		SOUND_OUTPUT,
+		INTERFACE_COMPLEXITY,
+		PLAYER_CONTENT_DIRECTORY,
+		PLAYER_PLAYLIST_DIRECTORY,
+		HISTORY,
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+		PLAYER_BACKGROUND_IMAGE,
+#endif
 		OTHER
 	};
 
@@ -359,6 +367,8 @@ public:
 		NAG_ENCRYPTED_METADATA,
 		NAG_REMAKE_DECRYPTION_CHAIN,
 		NAG_BAD_SIGNER_CHAIN,
+		/* Not really a nag but it's the same idea */
+		NAG_INITIAL_SETUP,
 		NAG_COUNT
 	};
 
@@ -431,6 +441,95 @@ public:
 		return _barco_password;
 	}
 
+	boost::optional<std::string> christie_username () const {
+		return _christie_username;
+	}
+
+	boost::optional<std::string> christie_password () const {
+		return _christie_password;
+	}
+
+	boost::optional<std::string> gdc_username () const {
+		return _gdc_username;
+	}
+
+	boost::optional<std::string> gdc_password () const {
+		return _gdc_password;
+	}
+
+	enum Interface {
+		INTERFACE_SIMPLE,
+		INTERFACE_FULL
+	};
+
+	Interface interface_complexity () const {
+		return _interface_complexity;
+	}
+
+	enum PlayerMode {
+		PLAYER_MODE_WINDOW,
+		PLAYER_MODE_FULL,
+		PLAYER_MODE_DUAL
+	};
+
+	PlayerMode player_mode () const {
+		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_content_directory () const {
+		return _player_content_directory;
+	}
+
+	boost::optional<boost::filesystem::path> player_playlist_directory () const {
+		return _player_playlist_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;
+	}
+
+	std::string kdm_server_url () const {
+		return _kdm_server_url;
+	}
+
+	std::string player_watermark_theatre () const {
+		return _player_watermark_theatre;
+	}
+
+	int player_watermark_period () const {
+		return _player_watermark_period;
+	}
+
+	int player_watermark_duration () const {
+		return _player_watermark_duration;
+	}
+
+	std::vector<Monitor> required_monitors () const {
+		return _required_monitors;
+	}
+#endif
+
+	bool allow_spl_editing () const {
+		return _allow_spl_editing;
+	}
+
 	/* SET (mostly) */
 
 	void set_master_encoding_threads (int n) {
@@ -793,6 +892,140 @@ public:
 		maybe_set (_barco_password, boost::optional<std::string>());
 	}
 
+	void set_christie_username (std::string u) {
+		maybe_set (_christie_username, u);
+	}
+
+	void unset_christie_username () {
+		maybe_set (_christie_username, boost::optional<std::string>());
+	}
+
+	void set_christie_password (std::string p) {
+		maybe_set (_christie_password, p);
+	}
+
+	void unset_christie_password () {
+		maybe_set (_christie_password, boost::optional<std::string>());
+	}
+
+	void set_gdc_username (std::string u) {
+		maybe_set (_gdc_username, u);
+	}
+
+	void unset_gdc_username () {
+		maybe_set (_gdc_username, boost::optional<std::string>());
+	}
+
+	void set_gdc_password (std::string p) {
+		maybe_set (_gdc_password, p);
+	}
+
+	void unset_gdc_password () {
+		maybe_set (_gdc_password, boost::optional<std::string>());
+	}
+
+	void set_interface_complexity (Interface i) {
+		maybe_set (_interface_complexity, i, INTERFACE_COMPLEXITY);
+	}
+
+	void set_player_mode (PlayerMode m) {
+		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_content_directory (boost::filesystem::path p) {
+		maybe_set (_player_content_directory, p, PLAYER_CONTENT_DIRECTORY);
+	}
+
+	void unset_player_content_directory () {
+		if (!_player_content_directory) {
+			return;
+		}
+		_player_content_directory = boost::none;
+		changed (PLAYER_CONTENT_DIRECTORY);
+	}
+
+	void set_player_playlist_directory (boost::filesystem::path p) {
+		maybe_set (_player_playlist_directory, p, PLAYER_PLAYLIST_DIRECTORY);
+	}
+
+	void unset_player_playlist_directory () {
+		if (!_player_playlist_directory) {
+			return;
+		}
+		_player_playlist_directory = boost::none;
+		changed (PLAYER_PLAYLIST_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, PLAYER_BACKGROUND_IMAGE);
+	}
+
+	void unset_player_background_image () {
+		if (!_player_background_image) {
+			return;
+		}
+		_player_background_image = boost::none;
+		changed (PLAYER_BACKGROUND_IMAGE);
+	}
+
+	void set_kdm_server_url (std::string s) {
+		maybe_set (_kdm_server_url, s);
+	}
+
+	void set_player_watermark_theatre (std::string p) {
+		maybe_set (_player_watermark_theatre, p);
+	}
+
+	void set_player_watermark_period (int minutes) {
+		maybe_set (_player_watermark_period, minutes);
+	}
+
+	void set_player_watermark_duration (int milliseconds) {
+		maybe_set (_player_watermark_duration, milliseconds);
+	}
+
+	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 changed (Property p = OTHER);
 	boost::signals2::signal<void (Property)> Changed;
 	/** Emitted if read() failed on an existing Config file.  There is nothing
@@ -811,6 +1044,7 @@ public:
 	void write_cinemas () const;
 	void link (boost::filesystem::path new_file) const;
 	void copy_and_link (boost::filesystem::path new_file) const;
+	bool have_write_permission () const;
 
 	void save_template (boost::shared_ptr<const Film> film, std::string name) const;
 	bool existing_template (std::string name) const;
@@ -824,13 +1058,13 @@ public:
 	static void restore_defaults ();
 	static bool have_existing (std::string);
 	static boost::filesystem::path config_file ();
+	static boost::filesystem::path path (std::string file, bool create_directories = true);
 
 	/** If set, this overrides the standard path (in home, Library, AppData or wherever) for config.xml and cinemas.xml */
 	static boost::optional<boost::filesystem::path> override_path;
 
 private:
 	Config ();
-	static boost::filesystem::path path (std::string file, bool create_directories = true);
 	void read ();
 	void set_defaults ();
 	void set_kdm_email_to_default ();
@@ -970,6 +1204,33 @@ private:
 	bool _notification[NOTIFICATION_COUNT];
 	boost::optional<std::string> _barco_username;
 	boost::optional<std::string> _barco_password;
+	boost::optional<std::string> _christie_username;
+	boost::optional<std::string> _christie_password;
+	boost::optional<std::string> _gdc_username;
+	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_content_directory;
+	boost::optional<boost::filesystem::path> _player_playlist_directory;
+	boost::optional<boost::filesystem::path> _player_kdm_directory;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	boost::optional<boost::filesystem::path> _player_background_image;
+	std::string _kdm_server_url;
+	std::string _player_watermark_theatre;
+	/** watermark period in minutes */
+	int _player_watermark_period;
+	/** watermark duration in milliseconds */
+	int _player_watermark_duration;
+	std::vector<Monitor> _required_monitors;
+#endif
+	bool _allow_spl_editing;
 
 	static int const _current_version;