swaroop: remove SPL editing from player UI.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index b64690aadf4df86569b3e6a047d223038c1fbbfb..489e66db98af367eb14b6824642d3be633083708 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -176,7 +176,7 @@ Config::set_defaults ()
        _player_watermark_theatre = "";
        _player_watermark_period = 1;
        _player_watermark_duration = 50;
-       _allow_spl_editing = true;
+       _player_lock_file = boost::none;
 #endif
 
        _allowed_dcp_frame_rates.clear ();
@@ -528,7 +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);
+       _player_lock_file = f.optional_string_child("PlayerLockFile");
 #endif
 
        /* Replace any cinemas from config.xml with those from the configured file */
@@ -656,8 +656,8 @@ Config::write_config () const
        }
        if (_default_container) {
                /* [XML:opt] DefaultContainer ID of default container
-                * to use when creating new films (<code>185</code>,<code>239</code> or
-                * <code>190</code>).
+                  to use when creating new films (<code>185</code>,<code>239</code> or
+                  <code>190</code>).
                */
                root->add_child("DefaultContainer")->add_child_text (_default_container->id ());
        }
@@ -941,7 +941,9 @@ 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");
+       if (_player_lock_file) {
+               root->add_child("PlayerLockFile")->add_child_text(_player_lock_file->string());
+       }
 #endif
 
        try {