X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=eae57cc06f365195683780fb9d4c8358a576bcf4;hb=444809fb888ed99803f2d19c94d3faef067cf348;hp=a7a45708193133d5a12bf887eeacdb89f2dcfa2c;hpb=e6c828cbd577239e7c8e4c532161084a33843a0f;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index a7a457081..eae57cc06 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -32,6 +32,7 @@ #include "dkdm_wrapper.h" #include "compose.hpp" #include "crypto.h" +#include "dkdm_recipient.h" #include #include #include @@ -40,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -53,15 +53,16 @@ using std::cout; using std::ifstream; using std::string; using std::list; +using std::min; using std::max; using std::remove; using std::exception; using std::cerr; -using boost::shared_ptr; +using std::shared_ptr; +using std::make_shared; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::algorithm::trim; -using boost::shared_array; using dcp::raw_convert; Config* Config::_instance = 0; @@ -94,16 +95,16 @@ Config::set_defaults () _tms_password = ""; _allow_any_dcp_frame_rate = false; _allow_any_container = false; + _show_experimental_audio_processors = false; _language = optional (); _default_still_length = 10; _default_container = Ratio::from_id ("185"); - _default_scale_to = 0; _default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR"); _default_dcp_audio_channels = 6; _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; @@ -119,17 +120,19 @@ Config::set_defaults () _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 _win32_console = false; #endif _cinemas_file = path ("cinemas.xml"); + _dkdm_recipients_file = path ("dkdm_recipients.xml"); _show_hints_before_make_dcp = true; _confirm_kdm_email = true; _kdm_container_name_format = dcp::NameFormat ("KDM %f %c"); _kdm_filename_format = dcp::NameFormat ("KDM %f %c %s"); + _dkdm_filename_format = dcp::NameFormat ("DKDM %f %c %s"); _dcp_metadata_filename_format = dcp::NameFormat ("%t"); _dcp_asset_filename_format = dcp::NameFormat ("%t"); _jump_to_selected = true; @@ -162,7 +165,6 @@ Config::set_defaults () _christie_password = optional(); _gdc_username = optional(); _gdc_password = optional(); - _interface_complexity = INTERFACE_SIMPLE; _player_mode = PLAYER_MODE_WINDOW; _image_display = 0; _video_view_type = VIDEO_VIEW_SIMPLE; @@ -172,16 +174,7 @@ Config::set_defaults () _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_theatre = ""; - _player_watermark_period = 1; - _player_watermark_duration = 50; - _player_lock_file = boost::none; - _signer_chain_path = "signer"; - _decryption_chain_path = "decryption"; -#endif + _audio_mapping = boost::none; _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); @@ -206,15 +199,13 @@ Config::restore_defaults () shared_ptr Config::create_certificate_chain () { - return shared_ptr ( - new dcp::CertificateChain ( - openssl_path(), - "dcpomatic.com", - "dcpomatic.com", - ".dcpomatic.smpte-430-2.ROOT", - ".dcpomatic.smpte-430-2.INTERMEDIATE", - "CS.dcpomatic.smpte-430-2.LEAF" - ) + return make_shared ( + openssl_path(), + "dcpomatic.com", + "dcpomatic.com", + ".dcpomatic.smpte-430-2.ROOT", + ".dcpomatic.smpte-430-2.INTERMEDIATE", + "CS.dcpomatic.smpte-430-2.LEAF" ); } @@ -230,6 +221,7 @@ Config::backup () boost::filesystem::copy_file(path("config.xml", false), path(String::compose("config.xml.%1", n), false)); boost::filesystem::copy_file(path("cinemas.xml", false), path(String::compose("cinemas.xml.%1", n), false)); + boost::filesystem::copy_file(path("dkdm_recipients.xml", false), path(String::compose("dkdm_recipients.xml.%1", n), false)); } catch (...) {} } @@ -237,18 +229,10 @@ void 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 ()); - optional version = f.optional_number_child ("Version"); + auto version = f.optional_number_child ("Version"); if (version && *version < _current_version) { /* Back up the old config before we re-write it in a back-incompatible way */ backup (); @@ -267,16 +251,16 @@ try _default_directory = boost::optional (); } - boost::optional b = f.optional_number_child ("ServerPort"); + auto b = f.optional_number_child ("ServerPort"); if (!b) { b = f.optional_number_child ("ServerPortBase"); } _server_port_base = b.get (); - boost::optional u = f.optional_bool_child ("UseAnyServers"); + auto u = f.optional_bool_child ("UseAnyServers"); _use_any_servers = u.get_value_or (true); - BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("Server")) { + for (auto i: f.node_children("Server")) { if (i->node_children("HostName").size() == 1) { _servers.push_back (i->string_child ("HostName")); } else { @@ -293,7 +277,7 @@ try _language = f.optional_string_child ("Language"); - optional c = f.optional_string_child ("DefaultContainer"); + auto c = f.optional_string_child ("DefaultContainer"); if (c) { _default_container = Ratio::from_id (c.get ()); } @@ -303,11 +287,6 @@ try _default_container = Ratio::from_id ("185"); } - c = f.optional_string_child ("DefaultScaleTo"); - if (c) { - _default_scale_to = Ratio::from_id (c.get ()); - } - _default_dcp_content_type = DCPContentType::from_isdcf_name(f.optional_string_child("DefaultDCPContentType").get_value_or("FTR")); _default_dcp_audio_channels = f.optional_number_child("DefaultDCPAudioChannels").get_value_or (6); @@ -317,8 +296,16 @@ try _dcp_issuer = f.string_child ("DCPIssuer"); } - _default_upload_after_make_dcp = f.optional_bool_child("DefaultUploadAfterMakeDCP").get_value_or (false); + auto 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")); @@ -332,7 +319,9 @@ try _default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false); _default_kdm_directory = f.optional_string_child("DefaultKDMDirectory"); - /* Load any cinemas from config.xml */ + /* Read any cinemas that are still lying around in the config file + * from an old version. + */ read_cinemas (f); _mail_server = f.string_child ("MailServer"); @@ -357,7 +346,7 @@ try _kdm_subject = f.optional_string_child ("KDMSubject").get_value_or (_("KDM delivery: $CPL_NAME")); _kdm_from = f.string_child ("KDMFrom"); - BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("KDMCC")) { + for (auto i: f.node_children("KDMCC")) { if (!i->content().empty()) { _kdm_cc.push_back (i->content ()); } @@ -368,7 +357,7 @@ try _notification_subject = f.optional_string_child("NotificationSubject").get_value_or(_("DCP-o-matic notification")); _notification_from = f.optional_string_child("NotificationFrom").get_value_or(""); _notification_to = f.optional_string_child("NotificationTo").get_value_or(""); - BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("NotificationCC")) { + for (auto i: f.node_children("NotificationCC")) { if (!i->content().empty()) { _notification_cc.push_back (i->content ()); } @@ -384,6 +373,7 @@ try _maximum_j2k_bandwidth = f.optional_number_child ("MaximumJ2KBandwidth").get_value_or (250000000); _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate").get_value_or (false); _allow_any_container = f.optional_bool_child ("AllowAnyContainer").get_value_or (false); + _show_experimental_audio_processors = f.optional_bool_child ("ShowExperimentalAudioProcessors").get_value_or (false); _log_types = f.optional_number_child ("LogTypes").get_value_or (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR); _analyse_ebur128 = f.optional_bool_child("AnalyseEBUR128").get_value_or (true); @@ -392,34 +382,19 @@ try _win32_console = f.optional_bool_child ("Win32Console").get_value_or (false); #endif - BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("History")) { + for (auto i: f.node_children("History")) { _history.push_back (i->content ()); } - BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("PlayerHistory")) { + for (auto i: f.node_children("PlayerHistory")) { _player_history.push_back (i->content ()); } - cxml::NodePtr signer = f.optional_node_child ("Signer"); -#ifdef DCPOMATIC_VARIANT_SWAROOP - if (signer && signer->node_children().size() == 1) { - /* The content of 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 { - /* is not present or has children: ignore it and remake. */ - _signer_chain = create_certificate_chain (); - } -#else + auto signer = f.optional_node_child ("Signer"); if (signer) { - shared_ptr c (new dcp::CertificateChain ()); + auto c = make_shared(); /* Read the signing certificates and private key in from the config file */ - BOOST_FOREACH (cxml::NodePtr i, signer->node_children ("Certificate")) { + for (auto i: signer->node_children ("Certificate")) { c->add (dcp::Certificate (i->content ())); } c->set_key (signer->string_child ("PrivateKey")); @@ -428,27 +403,11 @@ try /* 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 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 { - /* is not present or has more children: ignore it and remake. */ - _decryption_chain = create_certificate_chain (); - } -#else + auto decryption = f.optional_node_child ("Decryption"); if (decryption) { - shared_ptr c (new dcp::CertificateChain ()); - BOOST_FOREACH (cxml::NodePtr i, decryption->node_children ("Certificate")) { + auto c = make_shared(); + for (auto i: decryption->node_children ("Certificate")) { c->add (dcp::Certificate (i->content ())); } c->set_key (decryption->string_child ("PrivateKey")); @@ -456,13 +415,12 @@ try } else { _decryption_chain = create_certificate_chain (); } -#endif /* These must be done before we call Bad as that might set one of the nags. */ - BOOST_FOREACH (cxml::NodePtr i, f.node_children("Nagged")) { - int const id = i->number_attribute("Id"); + for (auto i: f.node_children("Nagged")) { + auto const id = i->number_attribute("Id"); if (id >= 0 && id < NAG_COUNT) { _nagged[id] = raw_convert(i->content()); } @@ -470,7 +428,7 @@ try optional bad; - BOOST_FOREACH (dcp::Certificate const & i, _signer_chain->unordered()) { + for (auto const& i: _signer_chain->unordered()) { if (i.has_utf8_strings()) { bad = BAD_SIGNER_UTF8_STRINGS; } @@ -485,7 +443,7 @@ try } if (bad) { - optional const remake = Bad(*bad); + auto const remake = Bad(*bad); if (remake && *remake) { switch (*bad) { case BAD_SIGNER_UTF8_STRINGS: @@ -505,15 +463,17 @@ try } else { /* Old-style: one or more DKDM nodes */ _dkdms.reset (new DKDMGroup ("root")); - BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("DKDM")) { + for (auto i: f.node_children("DKDM")) { _dkdms->add (DKDMBase::read (i)); } } _cinemas_file = f.optional_string_child("CinemasFile").get_value_or (path ("cinemas.xml").string ()); + _dkdm_recipients_file = f.optional_string_child("DKDMRecipientsFile").get_value_or (path("dkdm_recipients.xml").string()); _show_hints_before_make_dcp = f.optional_bool_child("ShowHintsBeforeMakeDCP").get_value_or (true); _confirm_kdm_email = f.optional_bool_child("ConfirmKDMEmail").get_value_or (true); _kdm_container_name_format = dcp::NameFormat (f.optional_string_child("KDMContainerNameFormat").get_value_or ("KDM %f %c")); _kdm_filename_format = dcp::NameFormat (f.optional_string_child("KDMFilenameFormat").get_value_or ("KDM %f %c %s")); + _dkdm_filename_format = dcp::NameFormat (f.optional_string_child("DKDMFilenameFormat").get_value_or("DKDM %f %c %s")); _dcp_metadata_filename_format = dcp::NameFormat (f.optional_string_child("DCPMetadataFilenameFormat").get_value_or ("%t")); _dcp_asset_filename_format = dcp::NameFormat (f.optional_string_child("DCPAssetFilenameFormat").get_value_or ("%t")); _jump_to_selected = f.optional_bool_child("JumpToSelected").get_value_or (true); @@ -544,7 +504,7 @@ try _decode_reduction = f.optional_number_child("DecodeReduction"); _default_notify = f.optional_bool_child("DefaultNotify").get_value_or(false); - BOOST_FOREACH (cxml::NodePtr i, f.node_children("Notification")) { + for (auto i: f.node_children("Notification")) { int const id = i->number_attribute("Id"); if (id >= 0 && id < NOTIFICATION_COUNT) { _notification[id] = raw_convert(i->content()); @@ -558,11 +518,7 @@ try _gdc_username = f.optional_string_child("GDCUsername"); _gdc_password = f.optional_string_child("GDCPassword"); - optional ic = f.optional_string_child("InterfaceComplexity"); - if (ic && *ic == "full") { - _interface_complexity = INTERFACE_FULL; - } - optional pm = f.optional_string_child("PlayerMode"); + auto pm = f.optional_string_child("PlayerMode"); if (pm && *pm == "window") { _player_mode = PLAYER_MODE_WINDOW; } else if (pm && *pm == "full") { @@ -572,7 +528,7 @@ try } _image_display = f.optional_number_child("ImageDisplay").get_value_or(0); - optional vc = f.optional_string_child("VideoViewType"); + auto vc = f.optional_string_child("VideoViewType"); if (vc && *vc == "opengl") { _video_view_type = VIDEO_VIEW_OPENGL; } else if (vc && *vc == "simple") { @@ -588,24 +544,22 @@ try _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_theatre = f.optional_string_child("PlayerWatermarkTheatre").get_value_or(""); - _player_watermark_period = f.optional_number_child("PlayerWatermarkPeriod").get_value_or(1); - _player_watermark_duration = f.optional_number_child("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 (f.optional_node_child("AudioMapping")) { + _audio_mapping = AudioMapping (f.node_child("AudioMapping"), Film::current_state_version); + } + if (boost::filesystem::exists (_cinemas_file)) { cxml::Document f ("Cinemas"); f.read_file (_cinemas_file); read_cinemas (f); } + + if (boost::filesystem::exists (_dkdm_recipients_file)) { + cxml::Document f ("DKDMRecipients"); + f.read_file (_dkdm_recipients_file); + read_dkdm_recipients (f); + } } catch (...) { if (have_existing ("config.xml")) { @@ -639,13 +593,14 @@ Config::write () const { write_config (); write_cinemas (); + write_dkdm_recipients (); } void Config::write_config () const { xmlpp::Document doc; - xmlpp::Element* root = doc.create_root_node ("Config"); + auto root = doc.create_root_node ("Config"); /* [XML] Version The version number of the configuration file format. */ root->add_child("Version")->add_child_text (raw_convert(_current_version)); @@ -665,7 +620,7 @@ Config::write_config () const /* [XML] UseAnyServers 1 to broadcast to look for encoding servers to use, 0 to use only those configured. */ root->add_child("UseAnyServers")->add_child_text (_use_any_servers ? "1" : "0"); - BOOST_FOREACH (string i, _servers) { + for (auto i: _servers) { /* [XML:opt] Server IP address or hostname of an encoding server to use; you can use as many of these tags as you like. */ @@ -697,12 +652,6 @@ Config::write_config () const */ root->add_child("DefaultContainer")->add_child_text (_default_container->id ()); } - if (_default_scale_to) { - /* [XML:opt] DefaultScaleTo ID of default ratio to scale content to when creating new films - (see DefaultContainer for IDs). - */ - root->add_child("DefaultScaleTo")->add_child_text (_default_scale_to->id ()); - } if (_default_dcp_content_type) { /* [XML:opt] DefaultDCPContentType Default content type ot use when creating new films (FTR, SHR, TLR, TST, XSN, RTG, TSR, POL, @@ -715,8 +664,16 @@ Config::write_config () const 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 <ContentVersion>, <AudioLanguage>, <SubtitleLanguage>, <Territory>, @@ -766,7 +723,7 @@ Config::write_config () const root->add_child("KDMSubject")->add_child_text (_kdm_subject); /* [XML] KDMFrom From address to use for KDM emails. */ root->add_child("KDMFrom")->add_child_text (_kdm_from); - BOOST_FOREACH (string i, _kdm_cc) { + for (auto i: _kdm_cc) { /* [XML] KDMCC CC address to use for KDM emails; you can use as many of these tags as you like. */ root->add_child("KDMCC")->add_child_text (i); } @@ -781,7 +738,7 @@ Config::write_config () const root->add_child("NotificationFrom")->add_child_text (_notification_from); /* [XML] NotificationFrom To address to use for notification emails. */ root->add_child("NotificationTo")->add_child_text (_notification_to); - BOOST_FOREACH (string i, _notification_cc) { + for (auto i: _notification_cc) { /* [XML] NotificationCC CC address to use for notification emails; you can use as many of these tags as you like. */ root->add_child("NotificationCC")->add_child_text (i); } @@ -799,11 +756,14 @@ Config::write_config () const root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert (_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"); /* [XML] LogTypes Types of logging to write; a bitfield where 1 is general notes, 2 warnings, 4 errors, 8 debug information related - to encoding, 16 debug information related to encoding, 32 debug information for timing purposes, 64 debug information related - to sending email. + to 3D, 16 debug information related to encoding, 32 debug information for timing purposes, 64 debug information related + to sending email, 128 debug information related to the video view, 256 information about disk writing, 512 debug information + related to the player, 1024 debug information related to audio analyses. */ root->add_child("LogTypes")->add_child_text (raw_convert (_log_types)); /* [XML] AnalyseEBUR128 1 to do EBUR128 analyses when analysing audio, otherwise 0. */ @@ -815,53 +775,35 @@ Config::write_config () const 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 <Certificate> tags in order and a <PrivateKey> tag all containing PEM-encoded certificates or private keys as appropriate. */ - xmlpp::Element* signer = root->add_child ("Signer"); + auto signer = root->add_child ("Signer"); DCPOMATIC_ASSERT (_signer_chain); - BOOST_FOREACH (dcp::Certificate const & i, _signer_chain->unordered()) { + for (auto const& i: _signer_chain->unordered()) { 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"); + auto decryption = root->add_child ("Decryption"); DCPOMATIC_ASSERT (_decryption_chain); - BOOST_FOREACH (dcp::Certificate const & i, _decryption_chain->unordered()) { + for (auto const& i: _decryption_chain->unordered()) { 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 File menu of the GUI; there can be more than one of these tags. */ - BOOST_FOREACH (boost::filesystem::path i, _history) { + for (auto i: _history) { root->add_child("History")->add_child_text (i.string ()); } /* [XML] History Filename of DCP to present in the File menu of the player; there can be more than one of these tags. */ - BOOST_FOREACH (boost::filesystem::path i, _player_history) { + for (auto i: _player_history) { root->add_child("PlayerHistory")->add_child_text (i.string ()); } @@ -873,12 +815,16 @@ Config::write_config () const /* [XML] CinemasFile Filename of cinemas list file. */ root->add_child("CinemasFile")->add_child_text (_cinemas_file.string()); + /* [XML] DKDMRecipientsFile Filename of DKDM recipients list file. */ + root->add_child("DKDMRecipientsFile")->add_child_text (_dkdm_recipients_file.string()); /* [XML] ShowHintsBeforeMakeDCP 1 to show hints in the GUI before making a DCP, otherwise 0. */ root->add_child("ShowHintsBeforeMakeDCP")->add_child_text (_show_hints_before_make_dcp ? "1" : "0"); /* [XML] ConfirmKDMEmail 1 to confirm before sending KDM emails in the GUI, otherwise 0. */ root->add_child("ConfirmKDMEmail")->add_child_text (_confirm_kdm_email ? "1" : "0"); /* [XML] KDMFilenameFormat Format for KDM filenames. */ root->add_child("KDMFilenameFormat")->add_child_text (_kdm_filename_format.specification ()); + /* [XML] KDMFilenameFormat Format for DKDM filenames. */ + root->add_child("DKDMFilenameFormat")->add_child_text(_dkdm_filename_format.specification()); /* [XML] KDMContainerNameFormat Format for KDM containers (directories or ZIP files). */ root->add_child("KDMContainerNameFormat")->add_child_text (_kdm_container_name_format.specification ()); /* [XML] DCPMetadataFilenameFormat Format for DCP metadata filenames. */ @@ -968,24 +914,14 @@ Config::write_config () const } 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 simple for the reduced interface or full 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 window for a single window, full for full-screen and dual for full screen playback with controls on another monitor. */ @@ -1033,26 +969,14 @@ Config::write_config () const /* [XML] PlayerKDMDirectory Directory to use for player KDMs in the dual-screen mode. */ root->add_child("PlayerKDMDirectory")->add_child_text(_player_kdm_directory->string()); } -#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(_player_watermark_period)); - root->add_child("PlayerWatermarkDuration")->add_child_text(raw_convert(_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()); + if (_audio_mapping) { + _audio_mapping->as_xml (root->add_child("AudioMapping")); } -#endif try { - string const s = doc.write_to_string_formatted (); + auto const s = doc.write_to_string_formatted (); boost::filesystem::path tmp (string(config_file().string()).append(".tmp")); - FILE* f = fopen_boost (tmp, "w"); + auto f = fopen_boost (tmp, "w"); if (!f) { throw FileError (_("Could not open file for writing"), tmp); } @@ -1067,28 +991,45 @@ Config::write_config () const } } + +template void -Config::write_cinemas () const +write_file (string root_node, string node, string version, list> things, boost::filesystem::path file) { xmlpp::Document doc; - xmlpp::Element* root = doc.create_root_node ("Cinemas"); - root->add_child("Version")->add_child_text ("1"); + auto root = doc.create_root_node (root_node); + root->add_child("Version")->add_child_text(version); - BOOST_FOREACH (shared_ptr i, _cinemas) { - i->as_xml (root->add_child ("Cinema")); + for (auto i: things) { + i->as_xml (root->add_child(node)); } try { - doc.write_to_file_formatted (_cinemas_file.string() + ".tmp"); - boost::filesystem::remove (_cinemas_file); - boost::filesystem::rename (_cinemas_file.string() + ".tmp", _cinemas_file); + doc.write_to_file_formatted (file.string() + ".tmp"); + boost::filesystem::remove (file); + boost::filesystem::rename (file.string() + ".tmp", file); } catch (xmlpp::exception& e) { string s = e.what (); trim (s); - throw FileError (s, _cinemas_file); + throw FileError (s, file); } } + +void +Config::write_cinemas () const +{ + write_file ("Cinemas", "Cinema", "1", _cinemas, _cinemas_file); +} + + +void +Config::write_dkdm_recipients () const +{ + write_file ("DKDMRecipients", "DKDMRecipient", "1", _dkdm_recipients, _dkdm_recipients_file); +} + + boost::filesystem::path Config::default_directory_or (boost::filesystem::path a) const { @@ -1109,7 +1050,7 @@ Config::directory_or (optional dir, boost::filesystem:: } boost::system::error_code ec; - bool const e = boost::filesystem::exists (*dir, ec); + auto const e = boost::filesystem::exists (*dir, ec); if (ec || !e) { return a; } @@ -1227,11 +1168,15 @@ Config::add_to_history_internal (vector& h, boost::file void Config::clean_history_internal (vector& h) { - vector old = h; + auto old = h; h.clear (); - BOOST_FOREACH (boost::filesystem::path i, old) { - if (boost::filesystem::is_directory(i)) { - h.push_back (i); + for (auto i: old) { + try { + if (boost::filesystem::is_directory(i)) { + h.push_back (i); + } + } catch (...) { + /* We couldn't find out if it's a directory for some reason; just ignore it */ } } } @@ -1246,12 +1191,11 @@ void Config::read_cinemas (cxml::Document const & f) { _cinemas.clear (); - list cin = f.node_children ("Cinema"); - BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("Cinema")) { + for (auto i: f.node_children("Cinema")) { /* Slightly grotty two-part construction of Cinema here so that we can use shared_from_this. */ - shared_ptr cinema (new Cinema (i)); + auto cinema = make_shared(i); cinema->read_screens (i); _cinemas.push_back (cinema); } @@ -1276,6 +1220,36 @@ Config::set_cinemas_file (boost::filesystem::path file) changed (OTHER); } + +void +Config::read_dkdm_recipients (cxml::Document const & f) +{ + _dkdm_recipients.clear (); + for (auto i: f.node_children("DKDMRecipient")) { + _dkdm_recipients.push_back (shared_ptr(new DKDMRecipient(i))); + } +} + +void +Config::set_dkdm_recipients_file (boost::filesystem::path file) +{ + if (file == _dkdm_recipients_file) { + return; + } + + _dkdm_recipients_file = file; + + if (boost::filesystem::exists (_dkdm_recipients_file)) { + /* Existing file; read it in */ + cxml::Document f ("DKDMRecipients"); + f.read_file (_dkdm_recipients_file); + read_dkdm_recipients (f); + } + + changed (OTHER); +} + + void Config::save_template (shared_ptr film, string name) const { @@ -1286,12 +1260,12 @@ list Config::templates () const { if (!boost::filesystem::exists (path ("templates"))) { - return list (); + return {}; } list n; - for (boost::filesystem::directory_iterator i (path("templates")); i != boost::filesystem::directory_iterator(); ++i) { - n.push_back (i->path().filename().string()); + for (auto const& i: boost::filesystem::directory_iterator(path("templates"))) { + n.push_back (i.path().filename().string()); } return n; } @@ -1325,7 +1299,7 @@ boost::filesystem::path Config::config_file () { cxml::Document f ("Config"); - boost::filesystem::path main = path("config.xml", false); + auto main = path("config.xml", false); if (!boost::filesystem::exists (main)) { /* It doesn't exist, so there can't be any links; just return it */ return main; @@ -1334,7 +1308,7 @@ Config::config_file () /* See if there's a link */ try { f.read_file (main); - optional link = f.optional_string_child("Link"); + auto link = f.optional_string_child("Link"); if (link) { return *link; } @@ -1379,7 +1353,7 @@ Config::copy_and_link (boost::filesystem::path new_file) const bool Config::have_write_permission () const { - FILE* f = fopen_boost (config_file(), "r+"); + auto f = fopen_boost (config_file(), "r+"); if (!f) { return false; } @@ -1387,3 +1361,53 @@ Config::have_write_permission () const fclose (f); return true; } + +/** @param output_channels Number of output channels in use. + * @return Audio mapping for this output channel count (may be a default). + */ +AudioMapping +Config::audio_mapping (int output_channels) +{ + if (!_audio_mapping || _audio_mapping->output_channels() != output_channels) { + /* Set up a default */ + _audio_mapping = AudioMapping (MAX_DCP_AUDIO_CHANNELS, output_channels); + if (output_channels == 2) { + /* Special case for stereo output. + Map so that Lt = L(-3dB) + Ls(-3dB) + C(-6dB) + Lfe(-10dB) + Rt = R(-3dB) + Rs(-3dB) + C(-6dB) + Lfe(-10dB) + */ + _audio_mapping->set (dcp::LEFT, 0, 1 / sqrt(2)); // L -> Lt + _audio_mapping->set (dcp::RIGHT, 1, 1 / sqrt(2)); // R -> Rt + _audio_mapping->set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt + _audio_mapping->set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt + _audio_mapping->set (dcp::LFE, 0, 1 / sqrt(10)); // Lfe -> Lt + _audio_mapping->set (dcp::LFE, 1, 1 / sqrt(10)); // Lfe -> Rt + _audio_mapping->set (dcp::LS, 0, 1 / sqrt(2)); // Ls -> Lt + _audio_mapping->set (dcp::RS, 1, 1 / sqrt(2)); // Rs -> Rt + } else { + /* 1:1 mapping */ + for (int i = 0; i < min (MAX_DCP_AUDIO_CHANNELS, output_channels); ++i) { + _audio_mapping->set (i, i, 1); + } + } + } + + return *_audio_mapping; +} + +void +Config::set_audio_mapping (AudioMapping m) +{ + _audio_mapping = m; + changed (AUDIO_MAPPING); +} + +void +Config::set_audio_mapping_to_default () +{ + DCPOMATIC_ASSERT (_audio_mapping); + auto const ch = _audio_mapping->output_channels (); + _audio_mapping = boost::none; + _audio_mapping = audio_mapping (ch); + changed (AUDIO_MAPPING); +}