Christie support.

2 files changed, 37 insertions, 0 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 792ce5619..28af9b303 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -158,6 +158,8 @@ Config::set_defaults ()
 	}
 	_barco_username = optional<string>();
 	_barco_password = optional<string>();
+	_christie_username = optional<string>();
+	_christie_password = optional<string>();
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -467,6 +469,8 @@ try
 
 	_barco_username = f.optional_string_child("BarcoUsername");
 	_barco_password = f.optional_string_child("BarcoPassword");
+	_christie_username = f.optional_string_child("ChristieUsername");
+	_christie_password = f.optional_string_child("ChristiePassword");
 
 	/* Replace any cinemas from config.xml with those from the configured file */
 	if (boost::filesystem::exists (_cinemas_file)) {
@@ -818,6 +822,13 @@ Config::write_config () const
 		root->add_child("BarcoPassword")->add_child_text(*_barco_password);
 	}
 
+	if (_christie_username) {
+		root->add_child("ChristieUsername")->add_child_text(*_christie_username);
+	}
+	if (_christie_password) {
+		root->add_child("ChristiePassword")->add_child_text(*_christie_password);
+	}
+
 	try {
 		doc.write_to_file_formatted(config_file().string());
 	} catch (xmlpp::exception& e) {
diff --git a/src/lib/config.h b/src/lib/config.h
index 8bf766c02..b710f537d 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -431,6 +431,14 @@ public:
 		return _barco_password;
 	}
 
+	boost::optional<std::string> christie_username () const {
+		return _christie_username;
+	}
+
+	boost::optional<std::string> christie_password () const {
+		return _christie_password;
+	}
+
 	/* SET (mostly) */
 
 	void set_master_encoding_threads (int n) {
@@ -793,6 +801,22 @@ 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 changed (Property p = OTHER);
 	boost::signals2::signal<void (Property)> Changed;
 	/** Emitted if read() failed on an existing Config file.  There is nothing
@@ -970,6 +994,8 @@ 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;
 
 	static int const _current_version;