/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include <boost/algorithm/string.hpp>
#include <boost/foreach.hpp>
#include <boost/thread.hpp>
+#include <boost/make_shared.hpp>
#include <cstdlib>
#include <fstream>
#include <iostream>
using std::exception;
using std::cerr;
using boost::shared_ptr;
+using boost::make_shared;
using boost::optional;
using boost::algorithm::trim;
_default_still_length = 10;
_default_container = Ratio::from_id ("185");
_default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR");
+ _default_dcp_audio_channels = 6;
_default_j2k_bandwidth = 100000000;
_default_audio_delay = 0;
_default_interop = false;
_mail_user = "";
_mail_password = "";
_kdm_from = "";
- _kdm_cc = "";
+ _kdm_cc.clear ();
_kdm_bcc = "";
_check_for_updates = false;
_check_for_test_updates = false;
_maximum_j2k_bandwidth = 250000000;
_log_types = LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR;
+ _analyse_ebur128 = true;
_automatic_audio_analysis = false;
#ifdef DCPOMATIC_WINDOWS
_win32_console = false;
#endif
+ _cinemas_file = path ("cinemas.xml");
_allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
void
Config::read ()
{
- if (!have_existing ()) {
+ if (!have_existing ("config.xml")) {
+ cout << "No existing config.xml; creating chains.\n";
/* Make a new set of signing certificates and key */
_signer_chain = create_certificate_chain ();
/* And similar for decryption of KDMs */
_decryption_chain = create_certificate_chain ();
+ cout << "Writing config.\n";
write ();
return;
}
cxml::Document f ("Config");
- f.read_file (file ());
+ f.read_file (path ("config.xml"));
optional<string> c;
optional<int> version = f.optional_number_child<int> ("Version");
_default_dcp_content_type = DCPContentType::from_isdcf_name (c.get ());
}
+ _default_dcp_audio_channels = f.optional_number_child<int>("DefaultDCPAudioChannels").get_value_or (6);
+
if (f.optional_string_child ("DCPMetadataIssuer")) {
_dcp_issuer = f.string_child ("DCPMetadataIssuer");
} else if (f.optional_string_child ("DCPIssuer")) {
_default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
_default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false);
- list<cxml::NodePtr> cin = f.node_children ("Cinema");
- for (list<cxml::NodePtr>::iterator i = cin.begin(); i != cin.end(); ++i) {
- /* Slightly grotty two-part construction of Cinema here so that we can use
- shared_from_this.
- */
- shared_ptr<Cinema> cinema (new Cinema (*i));
- cinema->read_screens (*i);
- _cinemas.push_back (cinema);
- }
+ /* Load any cinemas from config.xml */
+ read_cinemas (f);
_mail_server = f.string_child ("MailServer");
_mail_port = f.optional_number_child<int> ("MailPort").get_value_or (25);
_mail_password = f.optional_string_child("MailPassword").get_value_or ("");
_kdm_subject = f.optional_string_child ("KDMSubject").get_value_or (_("KDM delivery: $CPL_NAME"));
_kdm_from = f.string_child ("KDMFrom");
- _kdm_cc = f.optional_string_child ("KDMCC").get_value_or ("");
+ BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("KDMCC")) {
+ if (!i->content().empty()) {
+ _kdm_cc.push_back (i->content ());
+ }
+ }
_kdm_bcc = f.optional_string_child ("KDMBCC").get_value_or ("");
_kdm_email = f.string_child ("KDMEmail");
_allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate").get_value_or (false);
_log_types = f.optional_number_child<int> ("LogTypes").get_value_or (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
+ _analyse_ebur128 = f.optional_bool_child("AnalyseEBUR128").get_value_or (true);
_automatic_audio_analysis = f.optional_bool_child ("AutomaticAudioAnalysis").get_value_or (false);
#ifdef DCPOMATIC_WINDOWS
_win32_console = f.optional_bool_child ("Win32Console").get_value_or (false);
cxml::NodePtr signer = f.optional_node_child ("Signer");
if (signer) {
- shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
+ shared_ptr<dcp::CertificateChain> 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")) {
c->add (dcp::Certificate (i->content ()));
cxml::NodePtr decryption = f.optional_node_child ("Decryption");
if (decryption) {
- shared_ptr<dcp::CertificateChain> c (new dcp::CertificateChain ());
+ shared_ptr<dcp::CertificateChain> c = make_shared<dcp::CertificateChain> ();
BOOST_FOREACH (cxml::NodePtr i, decryption->node_children ("Certificate")) {
c->add (dcp::Certificate (i->content ()));
}
_dkdms.push_back (dcp::EncryptedKDM (i->content ()));
}
+ _cinemas_file = f.optional_string_child("CinemasFile").get_value_or (path ("cinemas.xml").string ());
+
+ /* Replace any cinemas from config.xml with those from the configured file */
+ if (boost::filesystem::exists (_cinemas_file)) {
+ cxml::Document f ("Cinemas");
+ f.read_file (_cinemas_file);
+ read_cinemas (f);
+ }
}
/** @return Filename to write configuration to */
boost::filesystem::path
-Config::file (bool create_directories)
+Config::path (string file, bool create_directories)
{
boost::filesystem::path p;
#ifdef DCPOMATIC_OSX
if (create_directories) {
boost::filesystem::create_directories (p, ec);
}
- p /= "config.xml";
+ p /= file;
return p;
}
/** Write our configuration to disk */
void
Config::write () const
+{
+ write_config_xml ();
+ write_cinemas_xml ();
+}
+
+void
+Config::write_config_xml () const
{
xmlpp::Document doc;
xmlpp::Element* root = doc.create_root_node ("Config");
if (_default_dcp_content_type) {
root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->isdcf_name ());
}
+ root->add_child("DefaultDCPAudioChannels")->add_child_text (raw_convert<string> (_default_dcp_audio_channels));
root->add_child("DCPIssuer")->add_child_text (_dcp_issuer);
root->add_child("DCPCreator")->add_child_text (_dcp_creator);
root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert<string> (_default_j2k_bandwidth));
root->add_child("DefaultAudioDelay")->add_child_text (raw_convert<string> (_default_audio_delay));
root->add_child("DefaultInterop")->add_child_text (_default_interop ? "1" : "0");
-
- for (list<shared_ptr<Cinema> >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) {
- (*i)->as_xml (root->add_child ("Cinema"));
- }
-
root->add_child("MailServer")->add_child_text (_mail_server);
root->add_child("MailPort")->add_child_text (raw_convert<string> (_mail_port));
root->add_child("MailUser")->add_child_text (_mail_user);
root->add_child("MailPassword")->add_child_text (_mail_password);
root->add_child("KDMSubject")->add_child_text (_kdm_subject);
root->add_child("KDMFrom")->add_child_text (_kdm_from);
- root->add_child("KDMCC")->add_child_text (_kdm_cc);
+ BOOST_FOREACH (string i, _kdm_cc) {
+ root->add_child("KDMCC")->add_child_text (i);
+ }
root->add_child("KDMBCC")->add_child_text (_kdm_bcc);
root->add_child("KDMEmail")->add_child_text (_kdm_email);
root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert<string> (_maximum_j2k_bandwidth));
root->add_child("AllowAnyDCPFrameRate")->add_child_text (_allow_any_dcp_frame_rate ? "1" : "0");
root->add_child("LogTypes")->add_child_text (raw_convert<string> (_log_types));
+ root->add_child("AnalyseEBUR128")->add_child_text (_analyse_ebur128 ? "1" : "0");
root->add_child("AutomaticAudioAnalysis")->add_child_text (_automatic_audio_analysis ? "1" : "0");
#ifdef DCPOMATIC_WINDOWS
root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0");
#endif
xmlpp::Element* signer = root->add_child ("Signer");
+ DCPOMATIC_ASSERT (_signer_chain);
BOOST_FOREACH (dcp::Certificate const & i, _signer_chain->root_to_leaf ()) {
signer->add_child("Certificate")->add_child_text (i.certificate (true));
}
signer->add_child("PrivateKey")->add_child_text (_signer_chain->key().get ());
xmlpp::Element* decryption = root->add_child ("Decryption");
+ DCPOMATIC_ASSERT (_decryption_chain);
BOOST_FOREACH (dcp::Certificate const & i, _decryption_chain->root_to_leaf ()) {
decryption->add_child("Certificate")->add_child_text (i.certificate (true));
}
root->add_child("DKDM")->add_child_text (i.as_xml ());
}
+ root->add_child("CinemasFile")->add_child_text (_cinemas_file.string());
+
try {
- doc.write_to_file_formatted (file().string ());
+ doc.write_to_file_formatted (path("config.xml").string ());
} catch (xmlpp::exception& e) {
string s = e.what ();
trim (s);
- throw FileError (s, file ());
+ throw FileError (s, path("config.xml"));
+ }
+}
+
+void
+Config::write_cinemas_xml () const
+{
+ xmlpp::Document doc;
+ xmlpp::Element* root = doc.create_root_node ("Cinemas");
+ root->add_child("Version")->add_child_text ("1");
+
+ for (list<shared_ptr<Cinema> >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) {
+ (*i)->as_xml (root->add_child ("Cinema"));
+ }
+
+ try {
+ doc.write_to_file_formatted (_cinemas_file.string ());
+ } catch (xmlpp::exception& e) {
+ string s = e.what ();
+ trim (s);
+ throw FileError (s, _cinemas_file);
}
}
}
bool
-Config::have_existing ()
+Config::have_existing (string file)
{
- return boost::filesystem::exists (file (false));
+ return boost::filesystem::exists (path (file, false));
+}
+
+void
+Config::read_cinemas (cxml::Document const & f)
+{
+ _cinemas.clear ();
+ list<cxml::NodePtr> cin = f.node_children ("Cinema");
+ for (list<cxml::NodePtr>::iterator i = cin.begin(); i != cin.end(); ++i) {
+ /* Slightly grotty two-part construction of Cinema here so that we can use
+ shared_from_this.
+ */
+ shared_ptr<Cinema> cinema = make_shared<Cinema> (*i);
+ cinema->read_screens (*i);
+ _cinemas.push_back (cinema);
+ }
+}
+
+void
+Config::set_cinemas_file (boost::filesystem::path file)
+{
+ _cinemas_file = file;
+
+ if (boost::filesystem::exists (_cinemas_file)) {
+ /* Existing file; read it in */
+ cxml::Document f ("Cinemas");
+ f.read_file (_cinemas_file);
+ read_cinemas (f);
+ }
+
+ changed (OTHER);
}
projects / dcpomatic.git / blobdiff