Merge 1.0 and some subtitling fixes.

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 93eec9bc0330fb4258f3f90d78de59759adc83b7..1c34619b42beeef2812880ae3001b80845e33c98 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -66,7 +66,7 @@ Config::Config ()
        , _default_j2k_bandwidth (200000000)
        , _default_audio_delay (0)
        , _kdm_email (
-               "Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\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"
                )
 {
        _allowed_dcp_frame_rates.push_back (24);
@@ -176,6 +176,8 @@ 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_from = f.string_child ("KDMFrom");
        _kdm_email = f.string_child ("KDMEmail");
 }
@@ -347,6 +349,8 @@ 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("KDMFrom")->add_child_text (_kdm_from);
        root->add_child("KDMEmail")->add_child_text (_kdm_email);