X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen.cc;h=097ff80b8bfbc77cf6358ffdc081e66213b7332b;hb=4fd32ca36487a1130a58769daee9fae22057ffcb;hp=5ef007214b874c02cbe52f8f5b4433a071a6a552;hpb=e18630852de1ac02c23c74cbe7643845b6f4bd17;p=dcpomatic.git

diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index 5ef007214..097ff80b8 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) {
@@ -116,6 +116,6 @@ kdm_for_screen (
 	name_values['e'] = end.date() + " " + end.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);
+	return make_shared<KDMWithMetadata>(name_values, cinema.get(), cinema ? cinema->emails : vector<string>(), kdm);
 }