diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-01-29 00:45:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-02-11 22:26:38 +0100 |
| commit | 20c7c1a0bc0c9c07d70b5d3dcc536a5cd94e8a2c (patch) | |
| tree | 7fdb8f0f6c1dbac69d024093323c739d6bbccb11 /src/lib/screen.cc | |
| parent | e18630852de1ac02c23c74cbe7643845b6f4bd17 (diff) | |
Pass make_kdm as a function into kdm_for_screen().
Diffstat (limited to 'src/lib/screen.cc')
| -rw-r--r-- | src/lib/screen.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/screen.cc b/src/lib/screen.cc index 5ef007214..dbf013111 100644 --- a/src/lib/screen.cc +++ b/src/lib/screen.cc @@ -75,8 +75,7 @@ Screen::trusted_device_thumbprints () const KDMWithMetadataPtr kdm_for_screen ( - shared_ptr<const Film> film, - boost::filesystem::path cpl, + std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm, shared_ptr<const dcpomatic::Screen> screen, boost::posix_time::ptime valid_from, boost::posix_time::ptime valid_to, @@ -101,8 +100,9 @@ kdm_for_screen ( throw InvalidSignerError(); } - auto const decrypted_kdm = film->make_kdm(cpl, begin, end); - auto kdm = decrypted_kdm.encrypt(signer, screen->recipient.get(), screen->trusted_device_thumbprints(), formulation, disable_forensic_marking_picture, disable_forensic_marking_audio); + auto kdm = make_kdm(begin, end).encrypt( + signer, screen->recipient.get(), screen->trusted_device_thumbprints(), formulation, disable_forensic_marking_picture, disable_forensic_marking_audio + ); dcp::NameFormat::Map name_values; if (cinema) { |