X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=31ae15b36a8942612789a48ad68e2a1e65fc088c;hb=264583479e79b481251f1772b228f82cd77552d3;hp=fbf0e3b632a7f303a4aed17ec20e0b62b8d7f59f;hpb=3df4d6271a6a660fdce143dcd65467c402e98976;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index fbf0e3b63..31ae15b36 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -167,12 +167,17 @@ 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 = boost::none;
+	_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 ();
@@ -229,7 +234,7 @@ void
 Config::read ()
 try
 {
-#ifdef DCPOMATIC_VARIANT_SWAROOP
+#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);
@@ -512,12 +517,20 @@ 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 = f.optional_string_child("PlayerWatermark");
+	_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 */
@@ -910,8 +923,11 @@ 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());
@@ -921,8 +937,15 @@ Config::write_config () const
 		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());
+	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
 
@@ -1073,7 +1096,7 @@ Config::add_to_history_internal (vector<boost::filesystem::path>& h, boost::file
 		h.pop_back ();
 	}
 
-	changed ();
+	changed (HISTORY);
 }
 
 bool