X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=d11bcf983f5365a872027570d840b1c5ff92dc36;hb=9a2b45caa81d8fb056802dfe3c25f214e808ffdf;hp=d7503b848c75dad058e00cde6afaaf6fedffae10;hpb=df085fc0ea4f1a3f009de5a7a5bf9f241173bcba;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index d7503b848..d11bcf983 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -17,7 +17,6 @@ */ -#include #include #include #include @@ -61,17 +60,17 @@ 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_scale (Ratio::from_id ("185")) , _default_container (Ratio::from_id ("185")) - , _default_dcp_content_type (DCPContentType::from_dci_name ("TST")) + , _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") - ) , _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); @@ -83,6 +82,8 @@ Config::Config () _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)); + + reset_kdm_email (); } void @@ -132,6 +133,11 @@ Config::read () _language = f.optional_string_child ("Language"); + c = f.optional_string_child ("DefaultScale"); + if (c) { + _default_scale = Ratio::from_id (c.get ()); + } + c = f.optional_string_child ("DefaultContainer"); if (c) { _default_container = Ratio::from_id (c.get ()); @@ -139,13 +145,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); @@ -180,13 +191,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_subject = f.optional_string_child ("KDMSubject").get_value_or (_("KDM delivery: $CPL_NAME")); _kdm_from = f.string_child ("KDMFrom"); + _kdm_cc = f.optional_string_child ("KDMCC").get_value_or (""); + _kdm_bcc = f.optional_string_child ("KDMBCC").get_value_or (""); _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 @@ -240,7 +257,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") { @@ -249,7 +266,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); } } @@ -310,7 +327,7 @@ Config::write () const xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("Config"); - root->add_child("Version")->add_child_text ("1"); + 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 (raw_convert (_server_port_base)); @@ -330,16 +347,19 @@ Config::write () const if (_language) { root->add_child("Language")->add_child_text (_language.get()); } + if (_default_scale) { + root->add_child("DefaultScale")->add_child_text (_default_scale->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 ()); + 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 (raw_convert (_default_still_length)); root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert (_default_j2k_bandwidth)); @@ -356,14 +376,19 @@ 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("KDMSubject")->add_child_text (_kdm_subject); root->add_child("KDMFrom")->add_child_text (_kdm_from); + root->add_child("KDMCC")->add_child_text (_kdm_cc); + root->add_child("KDMBCC")->add_child_text (_kdm_bcc); 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 ()); } @@ -396,3 +421,16 @@ Config::changed () write (); Changed (); } + +void +Config::reset_kdm_email () +{ + _kdm_email = _( + "Dear Projectionist\n\n" + "Please find attached KDMs for $CPL_NAME.\n\n" + "Cinema: $CINEMA_NAME\n" + "Screen(s): $SCREENS\n\n" + "The KDMs are valid from $START_TIME until $END_TIME.\n\n" + "Best regards,\nDCP-o-matic" + ); +}