X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=7497a0ea12f47727838d2ef895da42301c1eec53;hb=e6d7b6d8520c7454ecf67df7269056a16d0e2b70;hp=4ea709c81912f08d7fdeb4311fc3609314c731a0;hpb=94ab538738526948c5a52ed1222be1e484255541;p=dcpomatic.git diff --git a/test/test.cc b/test/test.cc index 4ea709c81..7497a0ea1 100644 --- a/test/test.cc +++ b/test/test.cc @@ -38,6 +38,7 @@ #include "lib/job.h" #include "lib/job_manager.h" #include "lib/log_entry.h" +#include "lib/make_dcp.h" #include "lib/ratio.h" #include "lib/signal_manager.h" #include "lib/util.h" @@ -129,7 +130,7 @@ class TestSignalManager : public SignalManager { public: /* No wakes in tests: we call ui_idle ourselves */ - void wake_ui () + void wake_ui () override { } @@ -369,7 +370,7 @@ rms_error (boost::filesystem::path ref, boost::filesystem::path check) auto check_image = check_proxy.image(Image::Alignment::COMPACT).image; BOOST_REQUIRE_EQUAL (ref_image->pixel_format(), check_image->pixel_format()); - AVPixelFormat const format = ref_image->pixel_format(); + auto const format = ref_image->pixel_format(); BOOST_REQUIRE (ref_image->size() == check_image->size()); int const width = ref_image->size().width; @@ -893,7 +894,7 @@ void make_and_verify_dcp (shared_ptr film, vector ignore) { film->write_metadata (); - film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE); + make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); auto notes = dcp::verify ({film->dir(film->dcp_name())}, &stage, &progress, TestPaths::xsd()); bool ok = true;