X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=a0211386baf224d248543f13848f9fb3aaac58a4;hb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;hp=1c34619b42beeef2812880ae3001b80845e33c98;hpb=e194f0003b60b2607da0822485c56cd8267e78dc;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index 1c34619b4..a0211386b 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 @@ -23,7 +23,8 @@ #include #include #include -#include +#include +#include #include #include "config.h" #include "server.h" @@ -46,10 +47,10 @@ 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; @@ -60,14 +61,19 @@ Config::Config () , _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 (Ratio::from_id ("185")) - , _default_dcp_content_type (DCPContentType::from_dci_name ("TST")) - , _default_j2k_bandwidth (200000000) + , _default_dcp_content_type (DCPContentType::from_isdcf_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" + _("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); @@ -76,16 +82,14 @@ 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)); + _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; @@ -137,13 +141,18 @@ Config::read () c = f.optional_string_child ("DefaultDCPContentType"); if (c) { - _default_dcp_content_type = DCPContentType::from_dci_name (c.get ()); + _default_dcp_content_type = DCPContentType::from_isdcf_name (c.get ()); } _dcp_metadata.issuer = f.optional_string_child ("DCPMetadataIssuer").get_value_or (""); _dcp_metadata.creator = f.optional_string_child ("DCPMetadataCreator").get_value_or (""); - _default_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata")); + if (version && version.get() >= 2) { + _default_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata")); + } else { + _default_isdcf_metadata = ISDCFMetadata (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); @@ -162,7 +171,7 @@ Config::read () /* 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)); + _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6)); } list cin = f.node_children ("Cinema"); @@ -180,6 +189,14 @@ Config::read () _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 @@ -233,7 +250,7 @@ Config::read_old_metadata () } 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); + _default_dcp_content_type = DCPContentType::from_isdcf_name (v); } else if (k == "dcp_metadata_issuer") { _dcp_metadata.issuer = v; } else if (k == "dcp_metadata_creator") { @@ -242,7 +259,7 @@ Config::read_old_metadata () _dcp_metadata.issue_date = v; } - _default_dci_metadata.read_old_metadata (k, v); + _default_isdcf_metadata.read_old_metadata (k, v); } } @@ -300,15 +317,13 @@ 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("Version")->add_child_text ("2"); + 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 (lexical_cast (_server_port_base)); + 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) { @@ -329,16 +344,16 @@ Config::write () const 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 ()); + root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->isdcf_name ()); } root->add_child("DCPMetadataIssuer")->add_child_text (_dcp_metadata.issuer); root->add_child("DCPMetadataCreator")->add_child_text (_dcp_metadata.creator); - _default_dci_metadata.as_xml (root->add_child ("DCIMetadata")); + _default_isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata")); - 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)); + 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)); for (vector::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) { i->as_xml (root->add_child ("ColourConversion")); @@ -354,6 +369,13 @@ Config::write () const 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 ()); } @@ -379,3 +401,10 @@ Config::drop () delete _instance; _instance = 0; } + +void +Config::changed () +{ + write (); + Changed (); +}