X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=0c6aed4a81455530b885c2c2efeaf6ffa9622c3f;hb=894f300034d560f2a38c1ec0b693cd463599ba53;hp=b6f464717b48c7f6ca3f5a590c58ca5480d01e22;hpb=cd4a82d90677cec80e891ac190000cb70767446f;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index b6f464717..0c6aed4a8 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -22,14 +22,18 @@ #include #include #include +#include #include #include "config.h" #include "server.h" #include "scaler.h" #include "filter.h" -#include "format.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" @@ -38,6 +42,9 @@ 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; @@ -46,14 +53,17 @@ Config* Config::_instance = 0; /** Construct default configuration */ Config::Config () - : _num_local_encoding_threads (2) + : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency())) , _server_port (6192) - , _reference_scaler (Scaler::from_id (N_("bicubic"))) - , _tms_path (N_(".")) + , _tms_path (".") , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750"))) , _default_still_length (10) - , _default_format (0) - , _default_dcp_content_type (0) + , _default_container (Ratio::from_id ("185")) + , _default_dcp_content_type (DCPContentType::from_dci_name ("TST")) + , _default_j2k_bandwidth (200000000) + , _kdm_email ( + "Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nBest regards,\nDCP-o-matic" + ) { _allowed_dcp_frame_rates.push_back (24); _allowed_dcp_frame_rates.push_back (25); @@ -62,30 +72,34 @@ Config::Config () _allowed_dcp_frame_rates.push_back (50); _allowed_dcp_frame_rates.push_back (60); + _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6)); + _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6)); + _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, libdcp::colour_matrix::rec709_to_xyz, 2.6)); +} + +void +Config::read () +{ + LocaleGuard lg; + if (!boost::filesystem::exists (file (false))) { read_old_metadata (); 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 ()); - } - - 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) { - _servers.push_back (new ServerDescription (*i)); + _servers.push_back (ServerDescription (*i)); } _tms_ip = f.string_child ("TMSIP"); @@ -100,9 +114,9 @@ Config::Config () _language = f.optional_string_child ("Language"); - c = f.optional_string_child ("DefaultFormat"); + c = f.optional_string_child ("DefaultContainer"); if (c) { - _default_format = Format::from_id (c.get ()); + _default_container = Ratio::from_id (c.get ()); } c = f.optional_string_child ("DefaultDCPContentType"); @@ -115,13 +129,46 @@ Config::Config () _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); + + 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, libdcp::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"); + _kdm_from = f.string_child ("KDMFrom"); + _kdm_email = f.string_child ("KDMEmail"); } void Config::read_old_metadata () { - ifstream f (file(true).c_str ()); + ifstream f (file(true).string().c_str ()); string line; + while (getline (f, line)) { if (line.empty ()) { continue; @@ -145,12 +192,11 @@ Config::read_old_metadata () _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)); } else if (k == N_("server")) { - _servers.push_back (ServerDescription::create_from_metadata (v)); + optional server = ServerDescription::create_from_metadata (v); + if (server) { + _servers.push_back (server.get ()); + } } else if (k == N_("tms_ip")) { _tms_ip = v; } else if (k == N_("tms_path")) { @@ -163,8 +209,8 @@ Config::read_old_metadata () _sound_processor = SoundProcessor::from_id (v); } else if (k == "language") { _language = v; - } else if (k == "default_format") { - _default_format = Format::from_id (v); + } else if (k == "default_container") { + _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") { @@ -180,17 +226,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 */ @@ -199,6 +260,16 @@ Config::instance () { if (_instance == 0) { _instance = new Config; + try { + _instance->read (); + } 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"; + } } return _instance; @@ -208,22 +279,18 @@ Config::instance () void Config::write () const { + LocaleGuard lg; + xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("Config"); + root->add_child("Version")->add_child_text ("1"); 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("DefaultDirectory")->add_child_text (_default_directory.string ()); 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 ()); - } - 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) { + i->as_xml (root->add_child ("Server")); } root->add_child("TMSIP")->add_child_text (_tms_ip); @@ -236,8 +303,8 @@ Config::write () const if (_language) { root->add_child("Language")->add_child_text (_language.get()); } - if (_default_format) { - root->add_child("DefaultFormat")->add_child_text (_default_format->id ()); + if (_default_container) { + root->add_child("DefaultContainer")->add_child_text (_default_container->id ()); } if (_default_dcp_content_type) { root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->dci_name ()); @@ -248,12 +315,27 @@ 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("DefaultJ2KBandwidth")->add_child_text (lexical_cast (_default_j2k_bandwidth)); + + 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("KDMFrom")->add_child_text (_kdm_from); + root->add_child("KDMEmail")->add_child_text (_kdm_email); - doc.write_to_file_formatted (file (false)); + std::cout << "dcpomatic: writing configuration to " << file(false).string() << "\n"; + doc.write_to_file_formatted (file(false).string ()); + std::cout << "dcpomatic: wrote configuration to " << file(false).string() << "\n"; } -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)) { return a;