X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_decoder_test.cc;h=a37b60ee8d00d73bce8c4e8ae9cb89c187f53493;hb=9bc613b81ac9f818b0eb4d190d7f6d0ef3cbcd78;hp=66cd402c487e415d1a167532048621b40ab3e8e3;hpb=952084c4221c5708e02c783284cf0f7239c6b4c4;p=dcpomatic.git

diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index 66cd402c4..a37b60ee8 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 <dcp/cpl.h>
 #include <dcp/dcp.h>
@@ -41,10 +42,9 @@
 
 
 using std::list;
+using std::make_shared;
 using std::string;
 using std::vector;
-using std::make_shared;
-using std::shared_ptr;
 
 
 /* Check that DCPDecoder reuses old data when it should */
@@ -52,16 +52,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);
@@ -69,16 +69,11 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	dcp::DCP encrypted_dcp (encrypted->dir(encrypted->dcp_name()));
 	encrypted_dcp.read ();
 
-	auto kdm = encrypted->make_kdm (
-		Config::instance()->decryption_chain()->leaf(),
-		vector<string>(),
-		encrypted_dcp.cpls().front()->file().get(),
-		dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
-		dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
-		dcp::Formulation::MODIFIED_TRANSITIONAL_1,
-		true, 0
-		);
+	auto signer = Config::instance()->signer_chain();
+	BOOST_REQUIRE(signer->valid());
 
+	auto const decrypted_kdm = encrypted->make_kdm(encrypted_dcp.cpls().front()->file().get(), dcp::LocalTime ("2030-07-21T00:00:00+00:00"), dcp::LocalTime ("2031-07-21T00:00:00+00:00"));
+	auto const kdm = decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0);
 
 	/* Add just the OV to a new project, move it around a bit and check that
 	   the _reels get reused.