diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-12-18 14:23:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-20 19:35:36 +0200 |
| commit | df5228d00d70d68218e7f606131a0c5fa2caba9f (patch) | |
| tree | 7362b301f4693051a8722945378d11d9a0ef4c1d /test | |
| parent | 6e0f867a69cf4e337370edc986347218afde548e (diff) | |
Move make_dcp() out of Film (#2132).
Diffstat (limited to 'test')
| -rw-r--r-- | test/interrupt_encoder_test.cc | 3 | ||||
| -rw-r--r-- | test/reels_test.cc | 3 | ||||
| -rw-r--r-- | test/test.cc | 3 | ||||
| -rw-r--r-- | test/threed_test.cc | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc index 5b76e67d3..2e839336d 100644 --- a/test/interrupt_encoder_test.cc +++ b/test/interrupt_encoder_test.cc @@ -31,6 +31,7 @@ #include "lib/ffmpeg_content.h" #include "lib/film.h" #include "lib/job_manager.h" +#include "lib/make_dcp.h" #include "lib/ratio.h" #include "test.h" #include <boost/test/unit_test.hpp> @@ -54,7 +55,7 @@ BOOST_AUTO_TEST_CASE (interrupt_encoder_test) film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); - film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE); + make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); dcpomatic_sleep_seconds (10); diff --git a/test/reels_test.cc b/test/reels_test.cc index 618a5b29b..82123b3e1 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -31,6 +31,7 @@ #include "lib/ffmpeg_content.h" #include "lib/film.h" #include "lib/image_content.h" +#include "lib/make_dcp.h" #include "lib/ratio.h" #include "lib/string_text_file_content.h" #include "lib/video_content.h" @@ -564,7 +565,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short4) BOOST_CHECK (film->reels().front() == dcpomatic::DCPTimePeriod(dcpomatic::DCPTime(), dcpomatic::DCPTime::from_frames(263, 24))); film->write_metadata (); - film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE); + make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); vector<boost::filesystem::path> dirs = { film->dir(film->dcp_name(false)) }; diff --git a/test/test.cc b/test/test.cc index fba6aea9f..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" @@ -893,7 +894,7 @@ void make_and_verify_dcp (shared_ptr<Film> film, vector<dcp::VerificationNote::Code> 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; diff --git a/test/threed_test.cc b/test/threed_test.cc index 0dd163035..4fe91ebca 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -33,6 +33,7 @@ #include "lib/film.h" #include "lib/job.h" #include "lib/job_manager.h" +#include "lib/make_dcp.h" #include "lib/ratio.h" #include "lib/video_content.h" #include "test.h" @@ -186,7 +187,7 @@ BOOST_AUTO_TEST_CASE (threed_test7) c->video->set_length (24); film->set_three_d (true); - film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE); + make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); film->write_metadata (); auto jm = JobManager::instance (); |