X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=ad1408cff89d4f07553ff2056175a3f44f18f780;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=1a97eaa0d450bf81dab9cbdb2610736fdea5040c;hpb=d7adece6d33d86c12a54c3e8f9e65f3bc501e4d7;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index 1a97eaa0d..ad1408cff 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -22,7 +22,8 @@ #include #include #include -#include +#include +#include #include #include "config.h" #include "server.h" @@ -33,34 +34,42 @@ #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; Config* Config::_instance = 0; /** Construct default configuration */ Config::Config () : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency())) - , _server_port (6192) + , _server_port_base (6192) + , _use_any_servers (true) , _tms_path (".") , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750"))) , _default_still_length (10) , _default_container (Ratio::from_id ("185")) , _default_dcp_content_type (DCPContentType::from_dci_name ("TST")) - , _default_j2k_bandwidth (200000000) + , _default_j2k_bandwidth (100000000) + , _default_audio_delay (0) , _kdm_email ( - "Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nBest regards,\nDCP-o-matic" + _("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) { _allowed_dcp_frame_rates.push_back (24); _allowed_dcp_frame_rates.push_back (25); @@ -69,14 +78,16 @@ 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.4, false, libdcp::colour_matrix::rec709_to_xyz, 2.2)); + _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 Config::read () { + LocaleGuard lg; + if (!boost::filesystem::exists (file (false))) { read_old_metadata (); return; @@ -90,13 +101,25 @@ Config::read () _num_local_encoding_threads = f.number_child ("NumLocalEncodingThreads"); _default_directory = f.string_child ("DefaultDirectory"); - _server_port = f.number_child ("ServerPort"); - - list > servers = f.node_children ("Server"); - for (list >::iterator i = servers.begin(); i != servers.end(); ++i) { - _servers.push_back (ServerDescription (*i)); + + 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 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 ()); + } + } + _tms_ip = f.string_child ("TMSIP"); _tms_path = f.string_child ("TMSPath"); _tms_user = f.string_child ("TMSUser"); @@ -125,14 +148,15 @@ 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"); + list cc = f.node_children ("ColourConversion"); if (!cc.empty ()) { _colour_conversions.clear (); } - for (list >::iterator i = cc.begin(); i != cc.end(); ++i) { + for (list::iterator i = cc.begin(); i != cc.end(); ++i) { _colour_conversions.push_back (PresetColourConversion (*i)); } @@ -140,11 +164,11 @@ Config::read () /* Loading version 0 (before Rec. 709 was added as a preset). Add it in. */ - _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.4, false, libdcp::colour_matrix::rec709_to_xyz, 2.2)); + _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) { + 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. */ @@ -154,13 +178,19 @@ Config::read () } _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); } void Config::read_old_metadata () { + /* XXX: this won't work with non-Latin filenames */ ifstream f (file(true).string().c_str ()); string line; @@ -186,11 +216,12 @@ 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 ()); + _server_port_base = atoi (v.c_str ()); } else if (k == N_("server")) { - optional server = ServerDescription::create_from_metadata (v); - if (server) { - _servers.push_back (server.get ()); + 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; @@ -232,6 +263,7 @@ Config::file (bool old) const p /= ".dvdomatic"; } else { p /= "dcpomatic"; + boost::filesystem::create_directory (p, ec); p /= "config.xml"; } return p; @@ -256,10 +288,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"; } } @@ -270,16 +305,19 @@ 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.string ()); - root->add_child("ServerPort")->add_child_text (lexical_cast (_server_port)); + root->add_child("ServerPortBase")->add_child_text (lexical_cast (_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); @@ -305,6 +343,7 @@ Config::write () const root->add_child("DefaultStillLength")->add_child_text (lexical_cast (_default_still_length)); root->add_child("DefaultJ2KBandwidth")->add_child_text (lexical_cast (_default_j2k_bandwidth)); + root->add_child("DefaultAudioDelay")->add_child_text (lexical_cast (_default_audio_delay)); for (vector::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) { i->as_xml (root->add_child ("ColourConversion")); @@ -315,16 +354,27 @@ Config::write () const } 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"); + doc.write_to_file_formatted (file(false).string ()); } 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; }