diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-23 01:02:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-23 01:02:24 +0100 |
| commit | f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef (patch) | |
| tree | c6bd8a27597855baf86663922294850fd41ece3a /src/lib/config.cc | |
| parent | e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3 (diff) | |
| parent | 33755d92926f6e9bf7403f3bde8b1d0645e6a618 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index a0211386b..bb1fcd211 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -67,9 +67,6 @@ Config::Config () , _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) @@ -85,6 +82,8 @@ Config::Config () _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)); + + reset_kdm_email (); } void @@ -188,6 +187,7 @@ Config::read () _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_cc = f.optional_string_child ("KDMCC").get_value_or (""); _kdm_email = f.string_child ("KDMEmail"); _check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false); @@ -367,6 +367,7 @@ Config::write () const 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("KDMCC")->add_child_text (_kdm_cc); root->add_child("KDMEmail")->add_child_text (_kdm_email); root->add_child("CheckForUpdates")->add_child_text (_check_for_updates ? "1" : "0"); @@ -408,3 +409,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" + ); +} |