X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fconfig.cc;h=b46093726bed345c25b649209b2af8f580796e47;hb=26866fdeba6dd868b1809de49799690555164f70;hp=3334e6fbf164b72123eb46f0ebde307be40b9305;hpb=f4b53f21561e581464a3a4f58c5b18d819b7969b;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index 3334e6fbf..b46093726 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -78,6 +78,7 @@ boost::signals2::signal Config::Bad; Config::Config () /* DKDMs are not considered a thing to reset on set_defaults() */ : _dkdms (new DKDMGroup ("root")) + , _default_kdm_duration (1, RoughDuration::Unit::WEEKS) { set_defaults (); } @@ -188,6 +189,7 @@ Config::set_defaults () _write_kdms_to_disk = true; _email_kdms = false; _default_kdm_type = dcp::Formulation::MODIFIED_TRANSITIONAL_1; + _default_kdm_duration = RoughDuration(1, RoughDuration::Unit::WEEKS); _auto_crop_threshold = 0.1; _allowed_dcp_frame_rates.clear (); @@ -580,6 +582,11 @@ try _write_kdms_to_disk = f.optional_bool_child("WriteKDMsToDisk").get_value_or(true); _email_kdms = f.optional_bool_child("EmailKDMs").get_value_or(false); _default_kdm_type = dcp::string_to_formulation(f.optional_string_child("DefaultKDMType").get_value_or("modified-transitional-1")); + if (auto duration = f.optional_node_child("DefaultKDMDuration")) { + _default_kdm_duration = RoughDuration(duration); + } else { + _default_kdm_duration = RoughDuration(1, RoughDuration::Unit::WEEKS); + } _auto_crop_threshold = f.optional_number_child("AutoCropThreshold").get_value_or(0.1); if (boost::filesystem::exists (_cinemas_file)) { @@ -725,6 +732,7 @@ Config::write_config () const /* [XML:opt] DefaultKDMDirectory Default directory to write KDMs to. */ root->add_child("DefaultKDMDirectory")->add_child_text (_default_kdm_directory->string ()); } + _default_kdm_duration.as_xml(root->add_child("DefaultKDMDuration")); /* [XML] MailServer Hostname of SMTP server to use. */ root->add_child("MailServer")->add_child_text (_mail_server); /* [XML] MailPort Port number to use on SMTP server. */