_default_j2k_bandwidth = 150000000;
_default_audio_delay = 0;
_default_interop = true;
- _default_upload_after_make_dcp = false;
+ _upload_after_make_dcp = false;
_mail_server = "";
_mail_port = 25;
_mail_protocol = EMAIL_PROTOCOL_AUTO;
_check_for_updates = false;
_check_for_test_updates = false;
_maximum_j2k_bandwidth = 250000000;
- _log_types = LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR;
+ _log_types = LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DISK;
_analyse_ebur128 = true;
_automatic_audio_analysis = false;
#ifdef DCPOMATIC_WINDOWS
_christie_password = optional<string>();
_gdc_username = optional<string>();
_gdc_password = optional<string>();
- _interface_complexity = INTERFACE_SIMPLE;
_player_mode = PLAYER_MODE_WINDOW;
_image_display = 0;
_video_view_type = VIDEO_VIEW_SIMPLE;
_player_playlist_directory = boost::none;
_player_kdm_directory = boost::none;
_audio_mapping = boost::none;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- _player_background_image = boost::none;
- _kdm_server_url = "http://localhost:8000/{CPL}";
- _player_watermark_theatre = "";
- _player_watermark_period = 1;
- _player_watermark_duration = 50;
- _player_lock_file = boost::none;
- _signer_chain_path = "signer";
- _decryption_chain_path = "decryption";
-#endif
_allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
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 ());
_dcp_issuer = f.string_child ("DCPIssuer");
}
- _default_upload_after_make_dcp = f.optional_bool_child("DefaultUploadAfterMakeDCP").get_value_or (false);
+ optional<bool> up = f.optional_bool_child("UploadAfterMakeDCP");
+ if (!up) {
+ up = f.optional_bool_child("DefaultUploadAfterMakeDCP");
+ }
+ _upload_after_make_dcp = up.get_value_or (false);
_dcp_creator = f.optional_string_child ("DCPCreator").get_value_or ("");
+ _dcp_company_name = f.optional_string_child("DCPCompanyName").get_value_or("");
+ _dcp_product_name = f.optional_string_child("DCPProductName").get_value_or("");
+ _dcp_product_version = f.optional_string_child("DCPProductVersion").get_value_or("");
+ _dcp_j2k_comment = f.optional_string_child("DCPJ2KComment").get_value_or("");
if (version && version.get() >= 2) {
_default_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata"));
}
cxml::NodePtr signer = f.optional_node_child ("Signer");
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- if (signer && signer->node_children().size() == 1) {
- /* The content of <Signer> is a path to a file; if it's relative it's in the same
- directory as .config. */
- _signer_chain_path = signer->content();
- if (_signer_chain_path.is_relative()) {
- _signer_chain = read_swaroop_chain (path(_signer_chain_path.string()));
- } else {
- _signer_chain = read_swaroop_chain (_signer_chain_path);
- }
- } else {
- /* <Signer> is not present or has children: ignore it and remake. */
- _signer_chain = create_certificate_chain ();
- }
-#else
if (signer) {
shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
/* Read the signing certificates and private key in from the config file */
/* Make a new set of signing certificates and key */
_signer_chain = create_certificate_chain ();
}
-#endif
cxml::NodePtr decryption = f.optional_node_child ("Decryption");
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- if (decryption && decryption->node_children().size() == 1) {
- /* The content of <Decryption> is a path to a file; if it's relative, it's in the same
- directory as .config. */
- _decryption_chain_path = decryption->content();
- if (_decryption_chain_path.is_relative()) {
- _decryption_chain = read_swaroop_chain (path(_decryption_chain_path.string()));
- } else {
- _decryption_chain = read_swaroop_chain (_decryption_chain_path);
- }
- } else {
- /* <Decryption> is not present or has more children: ignore it and remake. */
- _decryption_chain = create_certificate_chain ();
- }
-#else
if (decryption) {
shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
BOOST_FOREACH (cxml::NodePtr i, decryption->node_children ("Certificate")) {
} else {
_decryption_chain = create_certificate_chain ();
}
-#endif
/* These must be done before we call Bad as that might set one
of the nags.
_gdc_username = f.optional_string_child("GDCUsername");
_gdc_password = f.optional_string_child("GDCPassword");
- optional<string> ic = f.optional_string_child("InterfaceComplexity");
- if (ic && *ic == "full") {
- _interface_complexity = INTERFACE_FULL;
- }
optional<string> pm = f.optional_string_child("PlayerMode");
if (pm && *pm == "window") {
_player_mode = PLAYER_MODE_WINDOW;
_audio_mapping = AudioMapping (f.node_child("AudioMapping"), Film::current_state_version);
}
-#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_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
-
if (boost::filesystem::exists (_cinemas_file)) {
cxml::Document f ("Cinemas");
f.read_file (_cinemas_file);
root->add_child("DCPIssuer")->add_child_text (_dcp_issuer);
/* [XML] DCPIssuer Creator text to write into CPL files. */
root->add_child("DCPCreator")->add_child_text (_dcp_creator);
- /* [XML] DefaultUploadAfterMakeDCP 1 to default to uploading to a TMS after making a DCP, 0 to default to no upload. */
- root->add_child("DefaultUploadAfterMakeDCP")->add_child_text (_default_upload_after_make_dcp ? "1" : "0");
+ /* [XML] Company name to write into MXF files. */
+ root->add_child("DCPCompanyName")->add_child_text (_dcp_company_name);
+ /* [XML] Product name to write into MXF files. */
+ root->add_child("DCPProductName")->add_child_text (_dcp_product_name);
+ /* [XML] Product version to write into MXF files. */
+ root->add_child("DCPProductVersion")->add_child_text (_dcp_product_version);
+ /* [XML] Comment to write into JPEG2000 data. */
+ root->add_child("DCPJ2KComment")->add_child_text (_dcp_j2k_comment);
+ /* [XML] UploadAfterMakeDCP 1 to upload to a TMS after making a DCP, 0 for no upload. */
+ root->add_child("UploadAfterMakeDCP")->add_child_text (_upload_after_make_dcp ? "1" : "0");
/* [XML] ISDCFMetadata Default ISDCF metadata to use for new films; child tags are <code><ContentVersion></code>,
<code><AudioLanguage></code>, <code><SubtitleLanguage></code>, <code><Territory></code>,
root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert<string> (_maximum_j2k_bandwidth));
/* [XML] AllowAnyDCPFrameRate 1 to allow users to specify any frame rate when creating DCPs, 0 to limit the GUI to standard rates. */
root->add_child("AllowAnyDCPFrameRate")->add_child_text (_allow_any_dcp_frame_rate ? "1" : "0");
- /* [XML] AllowAnyContainer 1 to allow users to user any container ratio for their DCP, 0 to limit the GUI to standard containers. */
+ /* [XML] AllowAnyContainer 1 to allow users to user any container ratio for their DCP, 0 to limit the GUI to DCI Flat/Scope */
root->add_child("AllowAnyContainer")->add_child_text (_allow_any_container ? "1" : "0");
/* [XML] ShowExperimentalAudioProcessors 1 to offer users the (experimental) audio upmixer processors, 0 to hide them */
root->add_child("ShowExperimentalAudioProcessors")->add_child_text (_show_experimental_audio_processors ? "1" : "0");
root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0");
#endif
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- if (_signer_chain_path.is_relative()) {
- write_swaroop_chain (_signer_chain, path(_signer_chain_path.string()));
- } else {
- write_swaroop_chain (_signer_chain, _signer_chain_path);
- }
- root->add_child("Signer")->add_child_text(_signer_chain_path.string());
-#else
/* [XML] Signer Certificate chain and private key to use when signing DCPs and KDMs. Should contain <code><Certificate></code>
tags in order and a <code><PrivateKey></code> tag all containing PEM-encoded certificates or private keys as appropriate.
*/
signer->add_child("Certificate")->add_child_text (i.certificate (true));
}
signer->add_child("PrivateKey")->add_child_text (_signer_chain->key().get ());
-#endif
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- if (_decryption_chain_path.is_relative()) {
- write_swaroop_chain (_decryption_chain, path(_decryption_chain_path.string()));
- } else {
- write_swaroop_chain (_decryption_chain, _decryption_chain_path);
- }
- root->add_child("Decryption")->add_child_text(_decryption_chain_path.string());
-#else
/* [XML] Decryption Certificate chain and private key to use when decrypting KDMs */
xmlpp::Element* decryption = root->add_child ("Decryption");
DCPOMATIC_ASSERT (_decryption_chain);
decryption->add_child("Certificate")->add_child_text (i.certificate (true));
}
decryption->add_child("PrivateKey")->add_child_text (_decryption_chain->key().get ());
-#endif
/* [XML] History Filename of DCP to present in the <guilabel>File</guilabel> menu of the GUI; there can be more than one
of these tags.
}
if (_gdc_username) {
- /* [XML] GCCUsername Username for logging into GDC's servers when downloading server certificates. */
+ /* [XML] GDCUsername Username for logging into GDC's servers when downloading server certificates. */
root->add_child("GDCUsername")->add_child_text(*_gdc_username);
}
if (_gdc_password) {
- /* [XML] GCCPassword Password for logging into GDC's servers when downloading server certificates. */
+ /* [XML] GDCPassword Password for logging into GDC's servers when downloading server certificates. */
root->add_child("GDCPassword")->add_child_text(*_gdc_password);
}
- /* [XML] InterfaceComplexity <code>simple</code> for the reduced interface or <code>full</code> for the full interface. */
- switch (_interface_complexity) {
- case INTERFACE_SIMPLE:
- root->add_child("InterfaceComplexity")->add_child_text("simple");
- break;
- case INTERFACE_FULL:
- root->add_child("InterfaceComplexity")->add_child_text("full");
- break;
- }
-
/* [XML] PlayerMode <code>window</code> for a single window, <code>full</code> for full-screen and <code>dual</code> for full screen playback
with controls on another monitor.
*/
if (_audio_mapping) {
_audio_mapping->as_xml (root->add_child("AudioMapping"));
}
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- if (_player_background_image) {
- root->add_child("PlayerBackgroundImage")->add_child_text(_player_background_image->string());
- }
- root->add_child("KDMServerURL")->add_child_text(_kdm_server_url);
- 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 {
string const s = doc.write_to_string_formatted ();
projects / dcpomatic.git / blobdiff