From 9ddbf3bf5ad97aa2be2b37af56e4193e5e5de1a8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 1 Dec 2022 22:30:58 +0100 Subject: Move UTC offset for KDMs from the cinema to the point of KDM creation (#2300). --- src/lib/dkdm_recipient.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/lib/dkdm_recipient.cc') diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc index f25934083..32508eb8c 100644 --- a/src/lib/dkdm_recipient.cc +++ b/src/lib/dkdm_recipient.cc @@ -64,23 +64,20 @@ kdm_for_dkdm_recipient ( shared_ptr film, boost::filesystem::path cpl, shared_ptr 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(), 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(name_values, nullptr, recipient->emails, kdm); -- cgit v1.2.3