_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;
_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 ();
Config::read ()
try
{
-#ifdef DCPOMATIC_VARIANT_SWAROOP
+#if defined(DCPOMATIC_VARIANT_SWAROOP) && defined(DCPOMATIC_LINUX)
if (geteuid() == 0) {
/* Take ownership of the config file if we're root */
chown (config_file().string().c_str(), 0, 0);
_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");
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 */
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());
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 {
h.pop_back ();
}
- changed ();
+ changed (HISTORY);
}
bool