X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Freels_test.cc;h=82123b3e178d9680dd60c3b954236ef2d18a1094;hb=3d9c0674236a425f0be5e9caff5e23f59e7c037a;hp=5bb119f463965ec81d6fe204ba8b0cde17acf685;hpb=8963f0007af1a312017b9627c18b82ec2a577591;p=dcpomatic.git diff --git a/test/reels_test.cc b/test/reels_test.cc index 5bb119f46..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::make_shared; using std::function; +using std::list; +using std::make_shared; +using std::shared_ptr; +using std::string; +using std::vector; using namespace dcpomatic; @@ -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 (); + make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); vector dirs = { film->dir(film->dcp_name(false)) };