X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=da3ef228a243489046d94e56d587131597b236e3;hb=541e55115e8dfb09bb584f8176698d1db6ff826a;hp=702da44d084d72bec99c3aba9c715340d7c052a3;hpb=422eb00b446d90e3588ae6793f676917ee195cca;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 702da44d0..da3ef228a 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -164,8 +164,19 @@ Config::set_defaults ()
 	_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_content_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_theatre = "";
+	_player_watermark_period = 1;
+	_player_watermark_duration = 50;
+	_allow_spl_editing = true;
+#endif
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -221,6 +232,14 @@ void
 Config::read ()
 try
 {
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+	if (geteuid() == 0) {
+		/* Take ownership of the config file if we're root */
+		chown (config_file().string().c_str(), 0, 0);
+		chmod (config_file().string().c_str(), 0644);
+	}
+#endif
+
 	cxml::Document f ("Config");
 	f.read_file (config_file ());
 
@@ -493,8 +512,22 @@ try
 		_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_content_directory = f.optional_string_child("PlayerContentDirectory");
+	_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_theatre = f.optional_string_child("PlayerWatermarkTheatre").get_value_or("");
+	_player_watermark_period = f.optional_number_child<int>("PlayerWatermarkPeriod").get_value_or(1);
+	_player_watermark_duration = f.optional_number_child<int>("PlayerWatermarkDuration").get_value_or(150);
+	BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("RequiredMonitor")) {
+		_required_monitors.push_back(Monitor(i));
+	}
+	_allow_spl_editing = f.optional_bool_child("AllowSPLEditing").get_value_or(true);
+#endif
 
 	/* Replace any cinemas from config.xml with those from the configured file */
 	if (boost::filesystem::exists (_cinemas_file)) {
@@ -881,10 +914,30 @@ Config::write_config () const
 		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_content_directory) {
+		root->add_child("PlayerContentDirectory")->add_child_text(_player_content_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);
+	root->add_child("PlayerWatermarkTheatre")->add_child_text(_player_watermark_theatre);
+	root->add_child("PlayerWatermarkPeriod")->add_child_text(raw_convert<string>(_player_watermark_period));
+	root->add_child("PlayerWatermarkDuration")->add_child_text(raw_convert<string>(_player_watermark_duration));
+	BOOST_FOREACH (Monitor i, _required_monitors) {
+		i.as_xml(root->add_child("RequiredMonitor"));
+	}
+	root->add_child("AllowSPLEditing")->add_child_text(_allow_spl_editing ? "1" : "0");
+#endif
 
 	try {
 		doc.write_to_file_formatted(config_file().string());
@@ -1033,7 +1086,7 @@ Config::add_to_history_internal (vector<boost::filesystem::path>& h, boost::file
 		h.pop_back ();
 	}
 
-	changed ();
+	changed (HISTORY);
 }
 
 bool
@@ -1169,3 +1222,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;
+}