From 20c7c1a0bc0c9c07d70b5d3dcc536a5cd94e8a2c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Jan 2023 00:45:43 +0100 Subject: Pass make_kdm as a function into kdm_for_screen(). --- test/kdm_naming_test.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'test') 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 period_checks; auto cpl = cpls.front().cpl_file; + std::function 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 period_checks; list kdms; + + std::function 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), -- cgit v1.2.3