Add empty playlist list and configuration option.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 1d83f0a257b48c8b33da3d534930d7afa6c5869e..99115f2d765d7923a043f9e7f7b88d08743a5262 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -167,7 +167,8 @@ 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;
@@ -175,6 +176,7 @@ Config::set_defaults ()
        _player_watermark_theatre = "";
        _player_watermark_period = 1;
        _player_watermark_duration = 50;
+       _allow_spl_editing = true;
 #endif
 
        _allowed_dcp_frame_rates.clear ();
@@ -514,7 +516,8 @@ 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");
@@ -525,6 +528,7 @@ try
        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);
 #endif
 
        /* Replace any cinemas from config.xml with those from the configured file */
@@ -917,8 +921,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());
@@ -934,6 +941,7 @@ Config::write_config () const
        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");
 #endif
 
        try {
@@ -1083,7 +1091,7 @@ Config::add_to_history_internal (vector<boost::filesystem::path>& h, boost::file
                h.pop_back ();
        }
 
-       changed ();
+       changed (HISTORY);
 }
 
 bool