X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=54b9168f2542a1bbd8ee49d0b933f4c95007ada2;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=0b1b99e227d74d275a2efd3527222377a7f2ed04;hpb=bdf139bd50ace75551d92fcf41b51c57083670b3;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index 0b1b99e22..54b9168f2 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include "config.h" @@ -33,13 +34,13 @@ #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; @@ -47,13 +48,16 @@ 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) @@ -79,6 +83,8 @@ Config::Config () void Config::read () { + LocaleGuard lg; + if (!boost::filesystem::exists (file (false))) { read_old_metadata (); return; @@ -92,13 +98,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"); @@ -128,13 +146,13 @@ Config::read () _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"); + 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)); } @@ -145,8 +163,8 @@ Config::read () _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) { + 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. */ @@ -163,6 +181,7 @@ Config::read () void Config::read_old_metadata () { + /* XXX: this won't work with non-Latin filenames */ ifstream f (file(true).string().c_str ()); string line; @@ -188,11 +207,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; @@ -263,7 +283,7 @@ Config::instance () /* configuration load failed; never mind, just stick with the default. */ - cerr << "dcpomatic: failed to load configuration (" << e.what() << "\n"; + cerr << "dcpomatic: failed to load configuration (" << e.what() << ")\n"; } catch (...) { cerr << "dcpomatic: failed to load configuration\n"; } @@ -276,16 +296,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); @@ -324,9 +347,7 @@ Config::write () const root->add_child("KDMFrom")->add_child_text (_kdm_from); root->add_child("KDMEmail")->add_child_text (_kdm_email); - 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"; } boost::filesystem::path