From 08f96200aacf9f91ef3e3f5b80224a5b2437f279 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 1 May 2020 22:53:01 +0200 Subject: Move Film::make_kdms to the call sites. --- src/tools/dcpomatic_kdm_cli.cc | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/tools/dcpomatic_kdm_cli.cc') diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index 166b22285..505a70c2b 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -229,11 +229,26 @@ from_film ( values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false); try { - list > screen_kdms = film->make_kdms ( - screens, cpl, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio - ); + list > kdms; - write_files (screen_kdms, zip, output, container_name_format, filename_format, values, verbose); + BOOST_FOREACH (shared_ptr i, screens) { + if (i->recipient) { + dcp::EncryptedKDM const kdm = film->make_kdm ( + i->recipient.get(), + i->trusted_device_thumbprints(), + cpl, + dcp::LocalTime(valid_from, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0), + dcp::LocalTime(valid_to, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0), + formulation, + disable_forensic_marking_picture, + disable_forensic_marking_audio + ); + + kdms.push_back (shared_ptr(new DCPScreenKDM(i, kdm))); + } + } + + write_files (kdms, zip, output, container_name_format, filename_format, values, verbose); } catch (FileError& e) { cerr << program_name << ": " << e.what() << " (" << e.file().string() << ")\n"; exit (EXIT_FAILURE); -- cgit v1.2.3