diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-12-01 22:30:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-02-10 23:07:19 +0100 |
| commit | 9ddbf3bf5ad97aa2be2b37af56e4193e5e5de1a8 (patch) | |
| tree | d833ae122cea001b1f2a0b9a6d8788218c2792ee /src/lib/screen.cc | |
| parent | c4b409be0183508431e7ddbe4ad9bafe1f78a88e (diff) | |
Move UTC offset for KDMs from the cinema to the point of KDM creation (#2300).
Diffstat (limited to 'src/lib/screen.cc')
| -rw-r--r-- | src/lib/screen.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/screen.cc b/src/lib/screen.cc index 2c821eceb..801042c24 100644 --- a/src/lib/screen.cc +++ b/src/lib/screen.cc @@ -76,8 +76,8 @@ kdm_for_screen ( shared_ptr<const Film> film, boost::filesystem::path cpl, shared_ptr<const dcpomatic::Screen> screen, - boost::posix_time::ptime valid_from, - boost::posix_time::ptime valid_to, + dcp::LocalTime valid_from, + dcp::LocalTime valid_to, dcp::Formulation formulation, bool disable_forensic_marking_picture, optional<int> disable_forensic_marking_audio @@ -88,15 +88,13 @@ kdm_for_screen ( } auto cinema = screen->cinema; - dcp::LocalTime const begin(valid_from, dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0)); - dcp::LocalTime const end (valid_to, dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0)); auto const kdm = film->make_kdm ( screen->recipient.get(), screen->trusted_device_thumbprints(), cpl, - begin, - end, + valid_from, + valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio @@ -110,8 +108,8 @@ kdm_for_screen ( } name_values['s'] = screen->name; 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, cinema.get(), cinema ? cinema->emails : list<string>(), kdm); |