_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;
_kdm_server_url = "http://localhost:8000/{CPL}";
- _player_watermark = boost::none;
+ _player_watermark_theatre = "";
+ _player_watermark_period = 1;
+ _player_watermark_duration = 50;
+ _player_lock_file = boost::none;
#endif
_allowed_dcp_frame_rates.clear ();
Config::read ()
try
{
+#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);
+ chmod (config_file().string().c_str(), 0644);
+ }
+#endif
+
cxml::Document f ("Config");
f.read_file (config_file ());
_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");
_kdm_server_url = f.optional_string_child("KDMServerURL").get_value_or("http://localhost:8000/{CPL}");
- _player_watermark = f.optional_string_child("PlayerWatermark");
+ _player_watermark_theatre = f.optional_string_child("PlayerWatermarkTheatre").get_value_or("");
+ _player_watermark_period = f.optional_number_child<int>("PlayerWatermarkPeriod").get_value_or(1);
+ _player_watermark_duration = f.optional_number_child<int>("PlayerWatermarkDuration").get_value_or(150);
+ BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("RequiredMonitor")) {
+ _required_monitors.push_back(Monitor(i));
+ }
+ _player_lock_file = f.optional_string_child("PlayerLockFile");
#endif
/* Replace any cinemas from config.xml with those from the configured file */
}
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 ());
}
BOOST_FOREACH (dcp::Certificate const & i, _signer_chain->unordered()) {
signer->add_child("Certificate")->add_child_text (i.certificate (true));
}
+#ifdef DCPOMATIC_SWAROOP
+ FILE* f = fopen_boost (path("private"), "wb");
+ if (!f) {
+ throw FileError ("Could not open file for writing", path("private"));
+ }
+ shared_array<uint8_t> iv = dcpomatic::random_iv ();
+ dcp::Data encrypted_key = dcpomatic::encrypt (_signer_chain->key().get(), key, iv);
+ fwrite (encrypted_key.data().get(), encrypted_key.data().size(), 1, f);
+ fclose (f);
+#else
signer->add_child("PrivateKey")->add_child_text (_signer_chain->key().get ());
+#endif
/* [XML] Decryption Certificate chain and private key to use when decrypting KDMs */
xmlpp::Element* decryption = root->add_child ("Decryption");
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());
root->add_child("PlayerBackgroundImage")->add_child_text(_player_background_image->string());
}
root->add_child("KDMServerURL")->add_child_text(_kdm_server_url);
- if (_player_watermark) {
- root->add_child("PlayerWatermark")->add_child_text(_player_watermark->string());
+ root->add_child("PlayerWatermarkTheatre")->add_child_text(_player_watermark_theatre);
+ root->add_child("PlayerWatermarkPeriod")->add_child_text(raw_convert<string>(_player_watermark_period));
+ root->add_child("PlayerWatermarkDuration")->add_child_text(raw_convert<string>(_player_watermark_duration));
+ BOOST_FOREACH (Monitor i, _required_monitors) {
+ i.as_xml(root->add_child("RequiredMonitor"));
+ }
+ if (_player_lock_file) {
+ root->add_child("PlayerLockFile")->add_child_text(_player_lock_file->string());
}
#endif
try {
- doc.write_to_file_formatted(config_file().string());
+ string const s = doc.write_to_string_formatted ();
+ boost::filesystem::path const cf = config_file ();
+ FILE* f = fopen_boost (cf, "w");
+ if (!f) {
+ throw FileError (_("Could not open file for writing"), cf);
+ }
+ size_t const w = fwrite (s.c_str(), 1, s.length(), f);
+ if (w != s.length()) {
+ fclose (f);
+ throw FileError (_("Could not write whole file"), cf);
+ }
+ fclose (f);
} catch (xmlpp::exception& e) {
string s = e.what ();
trim (s);
- throw FileError (s, path("config.xml"));
+ throw FileError (s, config_file());
}
}
h.pop_back ();
}
- changed ();
+ changed (HISTORY);
}
bool
boost::filesystem::copy_file (config_file(), new_file, boost::filesystem::copy_option::overwrite_if_exists);
link (new_file);
}
+
+bool
+Config::have_write_permission () const
+{
+ FILE* f = fopen_boost (config_file(), "r+");
+ if (!f) {
+ return false;
+ }
+
+ fclose (f);
+ return true;
+}
projects / dcpomatic.git / blobdiff