Add KDM directory configuration in player.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 76c70ed5dacbf75ca78b66f0077e18af1ba78de8..5e953382dadb26ed99726fe2f9a844d67a07d9ee 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -162,6 +162,13 @@ Config::set_defaults ()
        _christie_password = optional<string>();
        _gdc_username = optional<string>();
        _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_dcp_directory = boost::none;
+       _player_kdm_directory = boost::none;
 
        _allowed_dcp_frame_rates.clear ();
        _allowed_dcp_frame_rates.push_back (24);
@@ -476,6 +483,25 @@ try
        _gdc_username = f.optional_string_child("GDCUsername");
        _gdc_password = f.optional_string_child("GDCPassword");
 
+       optional<string> ic = f.optional_string_child("InterfaceComplexity");
+       if (ic && *ic == "full") {
+               _interface_complexity = INTERFACE_FULL;
+       }
+       optional<string> pm = f.optional_string_child("PlayerMode");
+       if (pm && *pm == "window") {
+               _player_mode = PLAYER_MODE_WINDOW;
+       } else if (pm && *pm == "full") {
+               _player_mode = PLAYER_MODE_FULL;
+       } else if (pm && *pm == "dual") {
+               _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_dcp_directory = f.optional_string_child("PlayerDCPDirectory");
+       _player_kdm_directory = f.optional_string_child("PlayerKDMDirectory");
+
        /* Replace any cinemas from config.xml with those from the configured file */
        if (boost::filesystem::exists (_cinemas_file)) {
                cxml::Document f ("Cinemas");
@@ -840,6 +866,39 @@ Config::write_config () const
                root->add_child("GDCPassword")->add_child_text(*_gdc_password);
        }
 
+       switch (_interface_complexity) {
+       case INTERFACE_SIMPLE:
+               root->add_child("InterfaceComplexity")->add_child_text("simple");
+               break;
+       case INTERFACE_FULL:
+               root->add_child("InterfaceComplexity")->add_child_text("full");
+               break;
+       }
+
+       switch (_player_mode) {
+       case PLAYER_MODE_WINDOW:
+               root->add_child("PlayerMode")->add_child_text("window");
+               break;
+       case PLAYER_MODE_FULL:
+               root->add_child("PlayerMode")->add_child_text("full");
+               break;
+       case PLAYER_MODE_DUAL:
+               root->add_child("PlayerMode")->add_child_text("dual");
+               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());
+       }
+
        try {
                doc.write_to_file_formatted(config_file().string());
        } catch (xmlpp::exception& e) {