diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-01 22:53:01 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-04 17:17:12 +0200 |
| commit | 08f96200aacf9f91ef3e3f5b80224a5b2437f279 (patch) | |
| tree | 04ed6b723d3c41e514f8f78659590a89809b3658 /src/wx/kdm_dialog.cc | |
| parent | e81c5eb9e8ff875240dde9fdaaab0a46f99af615 (diff) | |
Move Film::make_kdms to the call sites.
Diffstat (limited to 'src/wx/kdm_dialog.cc')
| -rw-r--r-- | src/wx/kdm_dialog.cc | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 8682fe82f..59d961e6c 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -161,10 +161,23 @@ KDMDialog::make_clicked () /* Forensic mark up to this channel; disabled on channels greater than this */ for_audio = _output->forensic_mark_audio_up_to(); } - screen_kdms = film->make_kdms ( - _screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation(), - !_output->forensic_mark_video(), for_audio - ); + + BOOST_FOREACH (shared_ptr<dcpomatic::Screen> i, _screens->screens()) { + if (i->recipient) { + dcp::EncryptedKDM const kdm = film->make_kdm ( + i->recipient.get(), + i->trusted_device_thumbprints(), + _cpl->cpl(), + dcp::LocalTime(_timing->from(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0), + dcp::LocalTime(_timing->until(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0), + _output->formulation(), + !_output->forensic_mark_video(), + for_audio + ); + + screen_kdms.push_back (shared_ptr<ScreenKDM>(new DCPScreenKDM(i, kdm))); + } + } } catch (dcp::BadKDMDateError& e) { if (e.starts_too_early()) { |