From: Carl Hetherington Date: Sun, 12 Feb 2023 22:08:58 +0000 (+0100) Subject: Fix build for new libdcp. X-Git-Tag: v2.16.43~3 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f6f13ef1d72aba7362688c420d5cc67ab313b326;ds=sidebyside Fix build for new libdcp. --- diff --git a/src/lib/verify_dcp_job.cc b/src/lib/verify_dcp_job.cc index b59f5bfab..e054fae3a 100644 --- a/src/lib/verify_dcp_job.cc +++ b/src/lib/verify_dcp_job.cc @@ -76,7 +76,7 @@ VerifyDCPJob::update_stage (string s, optional path) void VerifyDCPJob::run () { - _notes = dcp::verify (_directories, bind (&VerifyDCPJob::update_stage, this, _1, _2), bind (&VerifyDCPJob::set_progress, this, _1, false), libdcp_resources_path() / "xsd"); + _notes = dcp::verify(_directories, bind(&VerifyDCPJob::update_stage, this, _1, _2), bind(&VerifyDCPJob::set_progress, this, _1, false), {}, libdcp_resources_path() / "xsd"); bool failed = false; for (auto i: _notes) { diff --git a/test/reels_test.cc b/test/reels_test.cc index 7fbf77f74..de3f56d2e 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -498,7 +498,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short1) make_and_verify_dcp (film); vector dirs = { film->dir(film->dcp_name(false)) }; - auto notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + auto notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } @@ -523,7 +523,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short2) make_and_verify_dcp (film); vector dirs = { film->dir(film->dcp_name(false)) }; - auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } @@ -544,7 +544,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short3) make_and_verify_dcp (film); - auto const notes = dcp::verify({}, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + auto const notes = dcp::verify({}, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } @@ -574,7 +574,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short4) BOOST_REQUIRE (!wait_for_jobs()); vector dirs = { film->dir(film->dcp_name(false)) }; - auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), {}, TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } diff --git a/test/test.cc b/test/test.cc index 90b40ed25..9d444e5cb 100644 --- a/test/test.cc +++ b/test/test.cc @@ -936,7 +936,7 @@ make_and_verify_dcp (shared_ptr film, vector film->write_metadata (); make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); - auto notes = dcp::verify ({film->dir(film->dcp_name())}, &stage, &progress, TestPaths::xsd()); + auto notes = dcp::verify({film->dir(film->dcp_name())}, &stage, &progress, {}, TestPaths::xsd()); bool ok = true; for (auto i: notes) { if (find(ignore.begin(), ignore.end(), i.code()) == ignore.end()) {