X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_decoder_test.cc;h=da4f6dcbb8bd0f4bb55dc7ee6ef8d9afa8b22ea2;hb=68397475b07181446d9593ca65c88c6261934afd;hp=45b715e95cb641a78a65cd31c058f4e0612f3ad1;hpb=ea63ad9560757e56505551db3bf2e1c31be5c76c;p=dcpomatic.git

diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index 45b715e95..da4f6dcbb 100644
--- a/test/dcp_decoder_test.cc
+++ b/test/dcp_decoder_test.cc
@@ -25,15 +25,17 @@
  */
 
 
-#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 <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
@@ -51,16 +53,16 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 {
 	/* Make some DCPs */
 
-	auto ov = new_test_film2 ("check_reuse_old_data_ov", {content_factory("test/data/flat_red.png").front()});
+	auto ov = new_test_film2 ("check_reuse_old_data_ov", content_factory("test/data/flat_red.png"));
 	make_and_verify_dcp (ov);
 
 	auto ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
-	auto vf = new_test_film2 ("check_reuse_old_data_vf", {ov_content, content_factory("test/data/L.wav").front()});
+	auto vf = new_test_film2 ("check_reuse_old_data_vf", {ov_content, content_factory("test/data/L.wav")[0]});
 	ov_content->set_reference_video (true);
 	make_and_verify_dcp (vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET});
 
 	auto encrypted = new_test_film2 ("check_reuse_old_data_decrypted");
-	encrypted->examine_and_add_content (content_factory("test/data/flat_red.png").front());
+	encrypted->examine_and_add_content (content_factory("test/data/flat_red.png")[0]);
 	BOOST_REQUIRE (!wait_for_jobs());
 	encrypted->set_encrypted (true);
 	make_and_verify_dcp (encrypted);
@@ -86,7 +88,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
 	test->examine_and_add_content (ov_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	auto player = make_shared<Player>(test);
+	auto player = make_shared<Player>(test, Image::Alignment::COMPACT);
 
 	auto decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
@@ -104,7 +106,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	auto vf_content = make_shared<DCPContent>(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<Player>(test, Image::Alignment::COMPACT);
 
 	decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
@@ -122,7 +124,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	auto encrypted_content = make_shared<DCPContent>(encrypted->dir(encrypted->dcp_name(false)));
 	test->examine_and_add_content (encrypted_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	player = make_shared<Player>(test);
+	player = make_shared<Player>(test, Image::Alignment::COMPACT);
 
 	decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);