X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Freels_test.cc;h=618a5b29b6276fd93247de5322c36b9ce7b15d66;hb=b915348a8288d68e2ff114fb3dd89ad22e699969;hp=a37e14067c8eff7612f37f7f6d62409198cb3f69;hpb=3b78e9223c9be784531475acacb88b59b2459f48;p=dcpomatic.git diff --git a/test/reels_test.cc b/test/reels_test.cc index a37e14067..618a5b29b 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -25,27 +25,27 @@ */ -#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/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; @@ -564,7 +564,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 (); + film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); vector dirs = { film->dir(film->dcp_name(false)) };