Quell config-save warning when we're only trying to save history.

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index abb775be8ec33e066de2caa0140260d4f2fa2d01..eb13112d2556d101533cdea9e85d5a575be41274 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -172,6 +172,9 @@ Config::set_defaults ()
 #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;
 #endif
 
        _allowed_dcp_frame_rates.clear ();
@@ -228,6 +231,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 ());
 
@@ -508,6 +519,12 @@ try
 #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));
+       }
 #endif
 
        /* Replace any cinemas from config.xml with those from the configured file */
@@ -911,6 +928,12 @@ 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);
+       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"));
+       }
 #endif
 
        try {
@@ -1060,7 +1083,7 @@ Config::add_to_history_internal (vector<boost::filesystem::path>& h, boost::file
                h.pop_back ();
        }
 
-       changed ();
+       changed (HISTORY);
 }
 
 bool
@@ -1196,3 +1219,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;
+}