X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=e1d5b958d1af3da9413247aabd4ab4fe4412b0a2;hb=1f1661f36ffd7a5662847f0642c7a7ebdcadc0f0;hp=792ce5619571f06304478494e329157bd67456b4;hpb=f8acc34bcb4401184064598353d6c54df3cab1f9;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 792ce5619..e1d5b958d 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -158,6 +158,22 @@ Config::set_defaults ()
 	}
 	_barco_username = optional<string>();
 	_barco_password = optional<string>();
+	_christie_username = optional<string>();
+	_christie_password = optional<string>();
+	_gdc_username = optional<string>();
+	_gdc_password = optional<string>();
+	_interface_complexity = INTERFACE_SIMPLE;
+	_player_mode = PLAYER_MODE_WINDOW;
+	_image_display = 0;
+	_respect_kdm_validity_periods = true;
+	_player_log_file = boost::none;
+	_player_dcp_directory = boost::none;
+	_player_kdm_directory = boost::none;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	_player_background_image = boost::none;
+	_kdm_server_url = "http://localhost:8000/{CPL}";
+	_player_watermark = boost::none;
+#endif
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -467,6 +483,34 @@ 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");
+	_gdc_username = f.optional_string_child("GDCUsername");
+	_gdc_password = f.optional_string_child("GDCPassword");
+
+	optional<string> ic = f.optional_string_child("InterfaceComplexity");
+	if (ic && *ic == "full") {
+		_interface_complexity = INTERFACE_FULL;
+	}
+	optional<string> pm = f.optional_string_child("PlayerMode");
+	if (pm && *pm == "window") {
+		_player_mode = PLAYER_MODE_WINDOW;
+	} else if (pm && *pm == "full") {
+		_player_mode = PLAYER_MODE_FULL;
+	} else if (pm && *pm == "dual") {
+		_player_mode = PLAYER_MODE_DUAL;
+	}
+
+	_image_display = f.optional_number_child<int>("ImageDisplay").get_value_or(0);
+	_respect_kdm_validity_periods = f.optional_bool_child("RespectKDMValidityPeriods").get_value_or(true);
+	_player_log_file = f.optional_string_child("PlayerLogFile");
+	_player_dcp_directory = f.optional_string_child("PlayerDCPDirectory");
+	_player_kdm_directory = f.optional_string_child("PlayerKDMDirectory");
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	_player_background_image = f.optional_string_child("PlayerBackgroundImage");
+	_kdm_server_url = f.optional_string_child("KDMServerURL").get_value_or("http://localhost:8000/{CPL}");
+	_player_watermark = f.optional_string_child("PlayerWatermark");
+#endif
 
 	/* Replace any cinemas from config.xml with those from the configured file */
 	if (boost::filesystem::exists (_cinemas_file)) {
@@ -818,6 +862,62 @@ 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);
+	}
+
+	if (_gdc_username) {
+		root->add_child("GDCUsername")->add_child_text(*_gdc_username);
+	}
+	if (_gdc_password) {
+		root->add_child("GDCPassword")->add_child_text(*_gdc_password);
+	}
+
+	switch (_interface_complexity) {
+	case INTERFACE_SIMPLE:
+		root->add_child("InterfaceComplexity")->add_child_text("simple");
+		break;
+	case INTERFACE_FULL:
+		root->add_child("InterfaceComplexity")->add_child_text("full");
+		break;
+	}
+
+	switch (_player_mode) {
+	case PLAYER_MODE_WINDOW:
+		root->add_child("PlayerMode")->add_child_text("window");
+		break;
+	case PLAYER_MODE_FULL:
+		root->add_child("PlayerMode")->add_child_text("full");
+		break;
+	case PLAYER_MODE_DUAL:
+		root->add_child("PlayerMode")->add_child_text("dual");
+		break;
+	}
+
+	root->add_child("ImageDisplay")->add_child_text(raw_convert<string>(_image_display));
+	root->add_child("RespectKDMValidityPeriods")->add_child_text(_respect_kdm_validity_periods ? "1" : "0");
+	if (_player_log_file) {
+		root->add_child("PlayerLogFile")->add_child_text(_player_log_file->string());
+	}
+	if (_player_dcp_directory) {
+		root->add_child("PlayerDCPDirectory")->add_child_text(_player_dcp_directory->string());
+	}
+	if (_player_kdm_directory) {
+		root->add_child("PlayerKDMDirectory")->add_child_text(_player_kdm_directory->string());
+	}
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	if (_player_background_image) {
+		root->add_child("PlayerBackgroundImage")->add_child_text(_player_background_image->string());
+	}
+	root->add_child("KDMServerURL")->add_child_text(_kdm_server_url);
+	if (_player_watermark) {
+		root->add_child("PlayerWatermark")->add_child_text(_player_watermark->string());
+	}
+#endif
+
 	try {
 		doc.write_to_file_formatted(config_file().string());
 	} catch (xmlpp::exception& e) {
@@ -1101,3 +1201,15 @@ Config::copy_and_link (boost::filesystem::path new_file) const
 	boost::filesystem::copy_file (config_file(), new_file, boost::filesystem::copy_option::overwrite_if_exists);
 	link (new_file);
 }
+
+bool
+Config::have_write_permission () const
+{
+	FILE* f = fopen_boost (config_file(), "r+");
+	if (!f) {
+		return false;
+	}
+
+	fclose (f);
+	return true;
+}