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/tools | |
| parent | c4b409be0183508431e7ddbe4ad9bafe1f78a88e (diff) | |
Move UTC offset for KDMs from the cinema to the point of KDM creation (#2300).
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index b0bc197aa..0f8404e23 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -371,13 +371,10 @@ private: continue; } - dcp::LocalTime begin(_timing->from(), dcp::UTCOffset(i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())); - dcp::LocalTime end(_timing->until(), dcp::UTCOffset(i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())); - /* Make an empty KDM */ dcp::DecryptedKDM kdm ( - begin, - end, + _timing->from(), + _timing->until(), decrypted.annotation_text().get_value_or (""), title, dcp::LocalTime().as_string() @@ -397,8 +394,8 @@ private: name_values['c'] = i->cinema->name; name_values['s'] = i->name; name_values['f'] = title; - 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'] = _timing->from().date() + " " + _timing->from().time_of_day(true, false); + name_values['e'] = _timing->until().date() + " " + _timing->until().time_of_day(true, false); name_values['i'] = encrypted.cpl_id (); /* Encrypt */ |