Untested watermarking.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index b28f8b957960b3a5a885829a6e0a49e7cb588742..d7fd74449e4ab59430cd68793b832b5f29ddcfd4 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -164,8 +164,16 @@ Config::set_defaults ()
        _gdc_password = optional<string>();
        _interface_complexity = INTERFACE_SIMPLE;
        _player_mode = PLAYER_MODE_WINDOW;
-       _respect_kdm_validity_periods = false;
+       _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);
@@ -493,8 +501,16 @@ try
                _player_mode = PLAYER_MODE_DUAL;
        }
 
-       _respect_kdm_validity_periods = f.optional_bool_child("RespectKDMValidityPeriods").get_value_or(false);
+       _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)) {
@@ -881,10 +897,26 @@ 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_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());