summaryrefslogtreecommitdiff
path: root/test/kdm_naming_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-01-29 00:45:43 +0100
committerCarl Hetherington <cth@carlh.net>2023-02-11 22:26:38 +0100
commit20c7c1a0bc0c9c07d70b5d3dcc536a5cd94e8a2c (patch)
tree7fdb8f0f6c1dbac69d024093323c739d6bbccb11 /test/kdm_naming_test.cc
parente18630852de1ac02c23c74cbe7643845b6f4bd17 (diff)
Pass make_kdm as a function into kdm_for_screen().
Diffstat (limited to 'test/kdm_naming_test.cc')
-rw-r--r--test/kdm_naming_test.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index 994217a14..30356afbf 100644
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -101,9 +101,11 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
std::vector<KDMCertificatePeriod> period_checks;
auto cpl = cpls.front().cpl_file;
+ std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm = [film, cpl](dcp::LocalTime begin, dcp::LocalTime end) {
+ return film->make_kdm(cpl, begin, end);
+ };
auto kdm = kdm_for_screen (
- film,
- cpls.front().cpl_file,
+ make_kdm,
cinema_a_screen_1,
boost::posix_time::time_from_string(from_string),
boost::posix_time::time_from_string(until_string),
@@ -167,10 +169,14 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on(
std::vector<KDMCertificatePeriod> period_checks;
list<KDMWithMetadataPtr> kdms;
+
+ std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm = [film, cpls](dcp::LocalTime begin, dcp::LocalTime end) {
+ return film->make_kdm(cpls.front().cpl_file, begin, end);
+ };
+
for (auto i: screens) {
auto kdm = kdm_for_screen (
- film,
- cpls.front().cpl_file,
+ make_kdm,
i,
boost::posix_time::time_from_string(from_string),
boost::posix_time::time_from_string(until_string),