X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Freels_test.cc;h=82123b3e178d9680dd60c3b954236ef2d18a1094;hp=47ead7e125ecfba620d72c5bad40fe6b7389d2f7;hb=fb0e2ead59a442700c671270c7d57b5bffeaeab3;hpb=41262015eb2bb1fc3da8585883420975de381a65 diff --git a/test/reels_test.cc b/test/reels_test.cc index 47ead7e12..82123b3e1 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -25,27 +25,28 @@ */ -#include "lib/film.h" -#include "lib/ratio.h" +#include "lib/content_factory.h" +#include "lib/dcp_content.h" +#include "lib/dcp_content_type.h" #include "lib/ffmpeg_content.h" +#include "lib/film.h" #include "lib/image_content.h" -#include "lib/dcp_content_type.h" -#include "lib/dcp_content.h" -#include "lib/video_content.h" +#include "lib/make_dcp.h" +#include "lib/ratio.h" #include "lib/string_text_file_content.h" -#include "lib/content_factory.h" +#include "lib/video_content.h" #include "test.h" #include #include -using std::list; using std::cout; -using std::vector; -using std::string; -using std::shared_ptr; +using std::function; +using std::list; using std::make_shared; -using boost::function; +using std::shared_ptr; +using std::string; +using std::vector; using namespace dcpomatic; @@ -390,7 +391,8 @@ BOOST_AUTO_TEST_CASE (reels_test10) { dcp::VerificationNote::Code::EXTERNAL_ASSET, dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, - dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME, + dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION, }); } @@ -563,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 (); + make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); vector dirs = { film->dir(film->dcp_name(false)) };