projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: only allow playback if configured lock file is present.
[dcpomatic.git]
/
src
/
lib
/
config.cc
diff --git
a/src/lib/config.cc
b/src/lib/config.cc
index b64690aadf4df86569b3e6a047d223038c1fbbfb..31ae15b36a8942612789a48ad68e2a1e65fc088c 100644
(file)
--- a/
src/lib/config.cc
+++ b/
src/lib/config.cc
@@
-177,6
+177,7
@@
Config::set_defaults ()
_player_watermark_period = 1;
_player_watermark_duration = 50;
_allow_spl_editing = true;
_player_watermark_period = 1;
_player_watermark_duration = 50;
_allow_spl_editing = true;
+ _player_lock_file = boost::none;
#endif
_allowed_dcp_frame_rates.clear ();
#endif
_allowed_dcp_frame_rates.clear ();
@@
-529,6
+530,7
@@
try
_required_monitors.push_back(Monitor(i));
}
_allow_spl_editing = f.optional_bool_child("AllowSPLEditing").get_value_or(true);
_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 */
#endif
/* Replace any cinemas from config.xml with those from the configured file */
@@
-942,6
+944,9
@@
Config::write_config () const
i.as_xml(root->add_child("RequiredMonitor"));
}
root->add_child("AllowSPLEditing")->add_child_text(_allow_spl_editing ? "1" : "0");
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 {
#endif
try {