Configurable window arrangement in player dual-screen mode.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index b28f8b957960b3a5a885829a6e0a49e7cb588742..e5d241d2b97bc5e2d4cbdeaa97c1c972a6cd505d 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -164,7 +164,8 @@ 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;
 
        _allowed_dcp_frame_rates.clear ();
@@ -493,7 +494,8 @@ 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");
 
        /* Replace any cinemas from config.xml with those from the configured file */
@@ -881,6 +883,7 @@ 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());