X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=1a503addeee8ceb4faad894646335ee70b11b1dd;hb=424d05c682958992c8b283bdbae0549c5b002730;hp=5e953382dadb26ed99726fe2f9a844d67a07d9ee;hpb=8414829693900c3d6362a4f15d677bb7e1462c3e;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5e953382d..1a503adde 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -167,8 +167,18 @@ Config::set_defaults ()
 	_image_display = 0;
 	_respect_kdm_validity_periods = true;
 	_player_log_file = boost::none;
-	_player_dcp_directory = boost::none;
+	_player_content_directory = boost::none;
+	_player_playlist_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;
+	_player_lock_file = boost::none;
+#endif
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -224,6 +234,14 @@ void
 Config::read ()
 try
 {
+#if defined(DCPOMATIC_VARIANT_SWAROOP) && defined(DCPOMATIC_LINUX)
+	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 ());
 
@@ -499,8 +517,21 @@ try
 	_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_content_directory = f.optional_string_child("PlayerContentDirectory");
+	_player_playlist_directory = f.optional_string_child("PlayerPlaylistDirectory");
 	_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);
+	_player_lock_file = f.optional_string_child("PlayerLockFile");
+#endif
 
 	/* Replace any cinemas from config.xml with those from the configured file */
 	if (boost::filesystem::exists (_cinemas_file)) {
@@ -627,8 +658,8 @@ Config::write_config () const
 	}
 	if (_default_container) {
 		/* [XML:opt] DefaultContainer ID of default container
-		 * to use when creating new films (<code>185</code>,<code>239</code> or
-		 * <code>190</code>).
+		   to use when creating new films (<code>185</code>,<code>239</code> or
+		   <code>190</code>).
 		*/
 		root->add_child("DefaultContainer")->add_child_text (_default_container->id ());
 	}
@@ -892,12 +923,31 @@ Config::write_config () const
 	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_content_directory) {
+		root->add_child("PlayerContentDirectory")->add_child_text(_player_content_directory->string());
+	}
+	if (_player_playlist_directory) {
+		root->add_child("PlayerPlaylistDirectory")->add_child_text(_player_playlist_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");
+	if (_player_lock_file) {
+		root->add_child("PlayerLockFile")->add_child_text(_player_lock_file->string());
+	}
+#endif
 
 	try {
 		doc.write_to_file_formatted(config_file().string());
@@ -1046,7 +1096,7 @@ Config::add_to_history_internal (vector<boost::filesystem::path>& h, boost::file
 		h.pop_back ();
 	}
 
-	changed ();
+	changed (HISTORY);
 }
 
 bool
@@ -1182,3 +1232,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;
+}