X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_decoder_test.cc;h=5d4d1e0cacbb2a2648513c56fac28352e747fe2d;hb=01cfa8b85b93589476ce3dbff5f9f207ad737abf;hp=a52a0ccc59941fb0af7c687bf7f45682d7652747;hpb=3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4;p=dcpomatic.git diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc index a52a0ccc5..5d4d1e0ca 100644 --- a/test/dcp_decoder_test.cc +++ b/test/dcp_decoder_test.cc @@ -25,14 +25,15 @@ */ -#include "lib/film.h" +#include "lib/config.h" +#include "lib/content_factory.h" #include "lib/dcp_content.h" #include "lib/dcp_decoder.h" -#include "lib/content_factory.h" -#include "lib/player.h" #include "lib/examine_content_job.h" +#include "lib/film.h" #include "lib/job_manager.h" -#include "lib/config.h" +#include "lib/piece.h" +#include "lib/player.h" #include "test.h" #include #include @@ -87,7 +88,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) ov_content = make_shared(ov->dir(ov->dcp_name(false))); test->examine_and_add_content (ov_content); BOOST_REQUIRE (!wait_for_jobs()); - auto player = make_shared(test); + auto player = make_shared(test, Image::Alignment::COMPACT); auto decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); @@ -105,7 +106,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) auto vf_content = make_shared(vf->dir(vf->dcp_name(false))); test->examine_and_add_content (vf_content); BOOST_REQUIRE (!wait_for_jobs()); - player.reset (new Player(test)); + player = make_shared(test, Image::Alignment::COMPACT); decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); @@ -123,7 +124,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) auto encrypted_content = make_shared(encrypted->dir(encrypted->dcp_name(false))); test->examine_and_add_content (encrypted_content); BOOST_REQUIRE (!wait_for_jobs()); - player = make_shared(test); + player = make_shared(test, Image::Alignment::COMPACT); decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder);