/*
- Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include <libxml++/libxml++.h>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
#include <boost/thread.hpp>
#include <cstdlib>
#include <fstream>
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 dcp::raw_convert;
_use_any_servers = true;
_servers.clear ();
_only_servers_encode = false;
- _tms_protocol = FILE_TRANSFER_PROTOCOL_SCP;
+ _tms_protocol = FileTransferProtocol::SCP;
_tms_ip = "";
_tms_path = ".";
_tms_user = "";
_upload_after_make_dcp = false;
_mail_server = "";
_mail_port = 25;
- _mail_protocol = EMAIL_PROTOCOL_AUTO;
+ _mail_protocol = EmailProtocol::AUTO;
_mail_user = "";
_mail_password = "";
_kdm_from = "";
_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
_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
+ _minimum_frame_size = 65536;
_allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
shared_ptr<dcp::CertificateChain>
Config::create_certificate_chain ()
{
- return shared_ptr<dcp::CertificateChain> (
- 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<dcp::CertificateChain> (
+ openssl_path(),
+ "dcpomatic.com",
+ "dcpomatic.com",
+ ".dcpomatic.smpte-430-2.ROOT",
+ ".dcpomatic.smpte-430-2.INTERMEDIATE",
+ "CS.dcpomatic.smpte-430-2.LEAF"
);
}
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<int> version = f.optional_number_child<int> ("Version");
+ auto version = f.optional_number_child<int> ("Version");
if (version && *version < _current_version) {
/* Back up the old config before we re-write it in a back-incompatible way */
backup ();
_default_directory = boost::optional<boost::filesystem::path> ();
}
- boost::optional<int> b = f.optional_number_child<int> ("ServerPort");
+ auto b = f.optional_number_child<int> ("ServerPort");
if (!b) {
b = f.optional_number_child<int> ("ServerPortBase");
}
_server_port_base = b.get ();
- boost::optional<bool> 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 {
}
_only_servers_encode = f.optional_bool_child ("OnlyServersEncode").get_value_or (false);
- _tms_protocol = static_cast<FileTransferProtocol>(f.optional_number_child<int>("TMSProtocol").get_value_or(static_cast<int>(FILE_TRANSFER_PROTOCOL_SCP)));
+ _tms_protocol = static_cast<FileTransferProtocol>(f.optional_number_child<int>("TMSProtocol").get_value_or(static_cast<int>(FileTransferProtocol::SCP)));
_tms_ip = f.string_child ("TMSIP");
_tms_path = f.string_child ("TMSPath");
_tms_user = f.string_child ("TMSUser");
_language = f.optional_string_child ("Language");
- optional<string> c = f.optional_string_child ("DefaultContainer");
+ auto c = f.optional_string_child ("DefaultContainer");
if (c) {
_default_container = Ratio::from_id (c.get ());
}
_dcp_issuer = f.string_child ("DCPIssuer");
}
- optional<bool> up = f.optional_bool_child("UploadAfterMakeDCP");
+ auto up = f.optional_bool_child("UploadAfterMakeDCP");
if (!up) {
up = f.optional_bool_child("DefaultUploadAfterMakeDCP");
}
/* Make sure this matches the code in write_config */
string const protocol = f.optional_string_child("MailProtocol").get_value_or("Auto");
if (protocol == "Auto") {
- _mail_protocol = EMAIL_PROTOCOL_AUTO;
+ _mail_protocol = EmailProtocol::AUTO;
} else if (protocol == "Plain") {
- _mail_protocol = EMAIL_PROTOCOL_PLAIN;
+ _mail_protocol = EmailProtocol::PLAIN;
} else if (protocol == "STARTTLS") {
- _mail_protocol = EMAIL_PROTOCOL_STARTTLS;
+ _mail_protocol = EmailProtocol::STARTTLS;
} else if (protocol == "SSL") {
- _mail_protocol = EMAIL_PROTOCOL_SSL;
+ _mail_protocol = EmailProtocol::SSL;
}
}
_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 ());
}
_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 ());
}
_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 <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
+ auto signer = f.optional_node_child ("Signer");
if (signer) {
- shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
+ auto c = make_shared<dcp::CertificateChain>();
/* 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"));
/* 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
+ auto decryption = f.optional_node_child ("Decryption");
if (decryption) {
- shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
- BOOST_FOREACH (cxml::NodePtr i, decryption->node_children ("Certificate")) {
+ auto c = make_shared<dcp::CertificateChain>();
+ for (auto i: decryption->node_children ("Certificate")) {
c->add (dcp::Certificate (i->content ()));
}
c->set_key (decryption->string_child ("PrivateKey"));
} 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<int>("Id");
+ for (auto i: f.node_children("Nagged")) {
+ auto const id = i->number_attribute<int>("Id");
if (id >= 0 && id < NAG_COUNT) {
_nagged[id] = raw_convert<int>(i->content());
}
optional<BadReason> 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;
}
}
if (bad) {
- optional<bool> const remake = Bad(*bad);
+ auto const remake = Bad(*bad);
if (remake && *remake) {
switch (*bad) {
case BAD_SIGNER_UTF8_STRINGS:
} 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));
}
}
_decode_reduction = f.optional_number_child<int>("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<int>("Id");
if (id >= 0 && id < NOTIFICATION_COUNT) {
_notification[id] = raw_convert<int>(i->content());
_gdc_username = f.optional_string_child("GDCUsername");
_gdc_password = f.optional_string_child("GDCPassword");
- optional<string> 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") {
}
_image_display = f.optional_number_child<int>("ImageDisplay").get_value_or(0);
- optional<string> 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") {
_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
+ _minimum_frame_size = f.optional_number_child<int>("MinimumFrameSize").get_value_or(65536);
if (boost::filesystem::exists (_cinemas_file)) {
cxml::Document f ("Cinemas");
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<string>(_current_version));
/* [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.
*/
root->add_child("MailPort")->add_child_text (raw_convert<string> (_mail_port));
/* [XML] MailProtocol Protocol to use on SMTP server (Auto, Plain, STARTTLS or SSL) */
switch (_mail_protocol) {
- case EMAIL_PROTOCOL_AUTO:
+ case EmailProtocol::AUTO:
root->add_child("MailProtocol")->add_child_text("Auto");
break;
- case EMAIL_PROTOCOL_PLAIN:
+ case EmailProtocol::PLAIN:
root->add_child("MailProtocol")->add_child_text("Plain");
break;
- case EMAIL_PROTOCOL_STARTTLS:
+ case EmailProtocol::STARTTLS:
root->add_child("MailProtocol")->add_child_text("STARTTLS");
break;
- case EMAIL_PROTOCOL_SSL:
+ case EmailProtocol::SSL:
root->add_child("MailProtocol")->add_child_text("SSL");
break;
}
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);
}
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);
}
/* [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<string> (_log_types));
/* [XML] AnalyseEBUR128 1 to do EBUR128 analyses when analysing audio, otherwise 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.
*/
- 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 <guilabel>File</guilabel> 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 <guilabel>File</guilabel> 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 ());
}
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
+ root->add_child("MinimumFrameSize")->add_child_text(raw_convert<string>(_minimum_frame_size));
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);
}
template <class T>
void
-write_file (string root_node, string node, string version, list<shared_ptr<T> > things, boost::filesystem::path file)
+write_file (string root_node, string node, string version, list<shared_ptr<T>> things, boost::filesystem::path file)
{
xmlpp::Document doc;
- xmlpp::Element* root = doc.create_root_node (root_node);
+ auto root = doc.create_root_node (root_node);
root->add_child("Version")->add_child_text(version);
- BOOST_FOREACH (shared_ptr<T> i, things) {
+ for (auto i: things) {
i->as_xml (root->add_child(node));
}
}
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;
}
void
Config::clean_history_internal (vector<boost::filesystem::path>& h)
{
- vector<boost::filesystem::path> old = h;
+ auto old = h;
h.clear ();
- BOOST_FOREACH (boost::filesystem::path i, old) {
+ for (auto i: old) {
try {
if (boost::filesystem::is_directory(i)) {
h.push_back (i);
Config::read_cinemas (cxml::Document const & f)
{
_cinemas.clear ();
- list<cxml::NodePtr> 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> cinema (new Cinema (i));
+ auto cinema = make_shared<Cinema>(i);
cinema->read_screens (i);
_cinemas.push_back (cinema);
}
Config::read_dkdm_recipients (cxml::Document const & f)
{
_dkdm_recipients.clear ();
- list<cxml::NodePtr> cin = f.node_children ("DKDMRecipient");
- BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("DKDMRecipient")) {
+ for (auto i: f.node_children("DKDMRecipient")) {
_dkdm_recipients.push_back (shared_ptr<DKDMRecipient>(new DKDMRecipient(i)));
}
}
Config::templates () const
{
if (!boost::filesystem::exists (path ("templates"))) {
- return list<string> ();
+ return {};
}
list<string> 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;
}
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;
/* See if there's a link */
try {
f.read_file (main);
- optional<string> link = f.optional_string_child("Link");
+ auto link = f.optional_string_child("Link");
if (link) {
return *link;
}
bool
Config::have_write_permission () const
{
- FILE* f = fopen_boost (config_file(), "r+");
+ auto f = fopen_boost (config_file(), "r+");
if (!f) {
return false;
}
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
+ _audio_mapping->set (dcp::Channel::LEFT, 0, 1 / sqrt(2)); // L -> Lt
+ _audio_mapping->set (dcp::Channel::RIGHT, 1, 1 / sqrt(2)); // R -> Rt
+ _audio_mapping->set (dcp::Channel::CENTRE, 0, 1 / 2.0); // C -> Lt
+ _audio_mapping->set (dcp::Channel::CENTRE, 1, 1 / 2.0); // C -> Rt
+ _audio_mapping->set (dcp::Channel::LFE, 0, 1 / sqrt(10)); // Lfe -> Lt
+ _audio_mapping->set (dcp::Channel::LFE, 1, 1 / sqrt(10)); // Lfe -> Rt
+ _audio_mapping->set (dcp::Channel::LS, 0, 1 / sqrt(2)); // Ls -> Lt
+ _audio_mapping->set (dcp::Channel::RS, 1, 1 / sqrt(2)); // Rs -> Rt
} else {
/* 1:1 mapping */
for (int i = 0; i < min (MAX_DCP_AUDIO_CHANNELS, output_channels); ++i) {
Config::set_audio_mapping_to_default ()
{
DCPOMATIC_ASSERT (_audio_mapping);
- int const ch = _audio_mapping->output_channels ();
+ auto const ch = _audio_mapping->output_channels ();
_audio_mapping = boost::none;
_audio_mapping = audio_mapping (ch);
changed (AUDIO_MAPPING);
projects / dcpomatic.git / blobdiff