X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=8be31a329645151bd424c4b77f7f52b13d74cc60;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hp=c5245bfb47135eaf61b01e949caabf8a1f964de2;hpb=996b0c06e23bcb6b300d7b8799df94993692e07d;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index c5245bfb4..8be31a329 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,38 +22,58 @@ #include #include #include +#include +#include +#include #include #include "config.h" #include "server.h" #include "scaler.h" #include "filter.h" -#include "container.h" +#include "ratio.h" #include "dcp_content_type.h" #include "sound_processor.h" +#include "colour_conversion.h" +#include "cinema.h" +#include "util.h" #include "i18n.h" using std::vector; using std::ifstream; using std::string; -using std::ofstream; using std::list; +using std::max; +using std::exception; +using std::cerr; using boost::shared_ptr; -using boost::lexical_cast; using boost::optional; +using boost::algorithm::is_any_of; +using boost::algorithm::split; +using dcp::raw_convert; Config* Config::_instance = 0; /** Construct default configuration */ Config::Config () - : _num_local_encoding_threads (2) - , _server_port (6192) - , _reference_scaler (Scaler::from_id (N_("bicubic"))) - , _tms_path (N_(".")) + : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency())) + , _server_port_base (6192) + , _use_any_servers (true) + , _tms_path (".") , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750"))) + , _allow_any_dcp_frame_rate (false) , _default_still_length (10) - , _default_container (0) - , _default_dcp_content_type (0) + , _default_container (Ratio::from_id ("185")) + , _default_dcp_content_type (DCPContentType::from_dci_name ("TST")) + , _default_j2k_bandwidth (100000000) + , _default_audio_delay (0) + , _kdm_email ( + _("Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nThe KDMs are valid from $START_TIME until $END_TIME.\n\nBest regards,\nDCP-o-matic") + ) + , _check_for_updates (false) + , _check_for_test_updates (false) + , _maximum_j2k_bandwidth (250000000) + , _log_types (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR) { _allowed_dcp_frame_rates.push_back (24); _allowed_dcp_frame_rates.push_back (25); @@ -61,6 +81,10 @@ Config::Config () _allowed_dcp_frame_rates.push_back (48); _allowed_dcp_frame_rates.push_back (50); _allowed_dcp_frame_rates.push_back (60); + + _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6)); + _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6)); + _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6)); } void @@ -71,27 +95,33 @@ Config::read () return; } - cxml::File f (file (false), "Config"); + cxml::Document f ("Config"); + f.read_file (file (false)); optional c; + optional version = f.optional_number_child ("Version"); + _num_local_encoding_threads = f.number_child ("NumLocalEncodingThreads"); _default_directory = f.string_child ("DefaultDirectory"); - _server_port = f.number_child ("ServerPort"); - c = f.optional_string_child ("ReferenceScaler"); - if (c) { - _reference_scaler = Scaler::from_id (c.get ()); + + boost::optional 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"); + _use_any_servers = u.get_value_or (true); - list > filters = f.node_children ("ReferenceFilter"); - for (list >::iterator i = filters.begin(); i != filters.end(); ++i) { - _reference_filters.push_back (Filter::from_id ((*i)->content ())); + list servers = f.node_children ("Server"); + for (list::iterator i = servers.begin(); i != servers.end(); ++i) { + if ((*i)->node_children("HostName").size() == 1) { + _servers.push_back ((*i)->string_child ("HostName")); + } else { + _servers.push_back ((*i)->content ()); + } } - list > servers = f.node_children ("Server"); - for (list >::iterator i = servers.begin(); i != servers.end(); ++i) { - _servers.push_back (new ServerDescription (*i)); - } - _tms_ip = f.string_child ("TMSIP"); _tms_path = f.string_child ("TMSPath"); _tms_user = f.string_child ("TMSUser"); @@ -106,7 +136,7 @@ Config::read () c = f.optional_string_child ("DefaultContainer"); if (c) { - _default_container = Container::from_id (c.get ()); + _default_container = Ratio::from_id (c.get ()); } c = f.optional_string_child ("DefaultDCPContentType"); @@ -119,13 +149,58 @@ Config::read () _default_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata")); _default_still_length = f.optional_number_child("DefaultStillLength").get_value_or (10); + _default_j2k_bandwidth = f.optional_number_child("DefaultJ2KBandwidth").get_value_or (200000000); + _default_audio_delay = f.optional_number_child("DefaultAudioDelay").get_value_or (0); + + list cc = f.node_children ("ColourConversion"); + + if (!cc.empty ()) { + _colour_conversions.clear (); + } + + for (list::iterator i = cc.begin(); i != cc.end(); ++i) { + _colour_conversions.push_back (PresetColourConversion (*i)); + } + + if (!version) { + /* Loading version 0 (before Rec. 709 was added as a preset). + Add it in. + */ + _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6)); + } + + list cin = f.node_children ("Cinema"); + for (list::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 (new Cinema (*i)); + cinema->read_screens (*i); + _cinemas.push_back (cinema); + } + + _mail_server = f.string_child ("MailServer"); + _mail_user = f.optional_string_child("MailUser").get_value_or (""); + _mail_password = f.optional_string_child("MailPassword").get_value_or (""); + _kdm_from = f.string_child ("KDMFrom"); + _kdm_email = f.string_child ("KDMEmail"); + + _check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false); + _check_for_test_updates = f.optional_bool_child("CheckForTestUpdates").get_value_or (false); + + _maximum_j2k_bandwidth = f.optional_number_child ("MaximumJ2KBandwidth").get_value_or (250000000); + _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate"); + + _log_types = f.optional_number_child ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR); } void Config::read_old_metadata () { - ifstream f (file(true).c_str ()); + /* XXX: this won't work with non-Latin filenames */ + ifstream f (file(true).string().c_str ()); string line; + while (getline (f, line)) { if (line.empty ()) { continue; @@ -148,13 +223,13 @@ Config::read_old_metadata () } else if (k == N_("default_directory")) { _default_directory = v; } else if (k == N_("server_port")) { - _server_port = atoi (v.c_str ()); - } else if (k == N_("reference_scaler")) { - _reference_scaler = Scaler::from_id (v); - } else if (k == N_("reference_filter")) { - _reference_filters.push_back (Filter::from_id (v)); + _server_port_base = atoi (v.c_str ()); } else if (k == N_("server")) { - _servers.push_back (ServerDescription::create_from_metadata (v)); + vector b; + split (b, v, is_any_of (" ")); + if (b.size() == 2) { + _servers.push_back (b[0]); + } } else if (k == N_("tms_ip")) { _tms_ip = v; } else if (k == N_("tms_path")) { @@ -168,7 +243,7 @@ Config::read_old_metadata () } else if (k == "language") { _language = v; } else if (k == "default_container") { - _default_container = Container::from_id (v); + _default_container = Ratio::from_id (v); } else if (k == "default_dcp_content_type") { _default_dcp_content_type = DCPContentType::from_dci_name (v); } else if (k == "dcp_metadata_issuer") { @@ -184,17 +259,32 @@ Config::read_old_metadata () } /** @return Filename to write configuration to */ -string +boost::filesystem::path Config::file (bool old) const { boost::filesystem::path p; p /= g_get_user_config_dir (); + boost::system::error_code ec; + boost::filesystem::create_directory (p, ec); if (old) { p /= ".dvdomatic"; } else { - p /= ".dcpomatic.xml"; + p /= "dcpomatic"; + boost::filesystem::create_directory (p, ec); + p /= "config.xml"; } - return p.string (); + return p; +} + +boost::filesystem::path +Config::signer_chain_directory () const +{ + boost::filesystem::path p; + p /= g_get_user_config_dir (); + p /= "dcpomatic"; + p /= "crypt"; + boost::filesystem::create_directories (p); + return p; } /** @return Singleton instance */ @@ -205,10 +295,13 @@ Config::instance () _instance = new Config; try { _instance->read (); - } catch (...) { + } catch (exception& e) { /* configuration load failed; never mind, just stick with the default. */ + cerr << "dcpomatic: failed to load configuration (" << e.what() << ")\n"; + } catch (...) { + cerr << "dcpomatic: failed to load configuration\n"; } } @@ -222,19 +315,14 @@ Config::write () const xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("Config"); - root->add_child("NumLocalEncodingThreads")->add_child_text (lexical_cast (_num_local_encoding_threads)); - root->add_child("DefaultDirectory")->add_child_text (_default_directory); - root->add_child("ServerPort")->add_child_text (lexical_cast (_server_port)); - if (_reference_scaler) { - root->add_child("ReferenceScaler")->add_child_text (_reference_scaler->id ()); - } - - for (vector::const_iterator i = _reference_filters.begin(); i != _reference_filters.end(); ++i) { - root->add_child("ReferenceFilter")->add_child_text ((*i)->id ()); - } + root->add_child("Version")->add_child_text ("1"); + root->add_child("NumLocalEncodingThreads")->add_child_text (raw_convert (_num_local_encoding_threads)); + root->add_child("DefaultDirectory")->add_child_text (_default_directory.string ()); + root->add_child("ServerPortBase")->add_child_text (raw_convert (_server_port_base)); + root->add_child("UseAnyServers")->add_child_text (_use_any_servers ? "1" : "0"); - for (vector::const_iterator i = _servers.begin(); i != _servers.end(); ++i) { - (*i)->as_xml (root->add_child ("Server")); + for (vector::const_iterator i = _servers.begin(); i != _servers.end(); ++i) { + root->add_child("Server")->add_child_text (*i); } root->add_child("TMSIP")->add_child_text (_tms_ip); @@ -258,15 +346,44 @@ Config::write () const _default_dci_metadata.as_xml (root->add_child ("DCIMetadata")); - root->add_child("DefaultStillLength")->add_child_text (lexical_cast (_default_still_length)); + root->add_child("DefaultStillLength")->add_child_text (raw_convert (_default_still_length)); + root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert (_default_j2k_bandwidth)); + root->add_child("DefaultAudioDelay")->add_child_text (raw_convert (_default_audio_delay)); - doc.write_to_file_formatted (file (false)); + for (vector::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) { + i->as_xml (root->add_child ("ColourConversion")); + } + + for (list >::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("MailUser")->add_child_text (_mail_user); + root->add_child("MailPassword")->add_child_text (_mail_password); + root->add_child("KDMFrom")->add_child_text (_kdm_from); + root->add_child("KDMEmail")->add_child_text (_kdm_email); + + root->add_child("CheckForUpdates")->add_child_text (_check_for_updates ? "1" : "0"); + root->add_child("CheckForTestUpdates")->add_child_text (_check_for_test_updates ? "1" : "0"); + + root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert (_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 (_log_types)); + + doc.write_to_file_formatted (file(false).string ()); } -string -Config::default_directory_or (string a) const +boost::filesystem::path +Config::default_directory_or (boost::filesystem::path a) const { - if (_default_directory.empty() || !boost::filesystem::exists (_default_directory)) { + if (_default_directory.empty()) { + return a; + } + + boost::system::error_code ec; + bool const e = boost::filesystem::exists (_default_directory, ec); + if (ec || !e) { return a; } @@ -279,3 +396,10 @@ Config::drop () delete _instance; _instance = 0; } + +void +Config::changed () +{ + write (); + Changed (); +}