Move UTC offset for KDMs from the cinema to the point of KDM creation (#2300).

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

diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc
index f25934083170d35920c1069d8afdd89d0ba0c8a7..32508eb8c193ac7234b20ce96d01aababee37fea 100644 (file)
--- a/src/lib/dkdm_recipient.cc
+++ b/src/lib/dkdm_recipient.cc
@@ -64,23 +64,20 @@ kdm_for_dkdm_recipient (
        shared_ptr<const Film> film,
        boost::filesystem::path cpl,
        shared_ptr<DKDMRecipient> recipient,
-       boost::posix_time::ptime valid_from,
-       boost::posix_time::ptime valid_to
+       dcp::LocalTime valid_from,
+       dcp::LocalTime valid_to
        )
 {
        if (!recipient->recipient) {
                return {};
        }
 
-       dcp::LocalTime const begin(valid_from, dcp::UTCOffset(recipient->utc_offset_hour, recipient->utc_offset_minute));
-       dcp::LocalTime const end  (valid_to,   dcp::UTCOffset(recipient->utc_offset_hour, recipient->utc_offset_minute));
-
        auto const kdm = film->make_kdm (
                        recipient->recipient.get(),
                        vector<string>(),
                        cpl,
-                       begin,
-                       end,
+                       valid_from,
+                       valid_to,
                        dcp::Formulation::MODIFIED_TRANSITIONAL_1,
                        true,
                        0
@@ -88,8 +85,8 @@ kdm_for_dkdm_recipient (
 
        dcp::NameFormat::Map name_values;
        name_values['f'] = kdm.content_title_text();
-       name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
-       name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+       name_values['b'] = valid_from.date() + " " + valid_from.time_of_day(true, false);
+       name_values['e'] = valid_to.date() + " " + valid_to.time_of_day(true, false);
        name_values['i'] = kdm.cpl_id();
 
        return make_shared<KDMWithMetadata>(name_values, nullptr, recipient->emails, kdm);