X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fremake_id_test.cc;h=349884f919e4a03012592b59c2330b8e7feed276;hb=cbecfe7ff652d61608f752239de8d134b052a28f;hp=43ed16ebb1f478088f39e7220b094b4b56d7adb5;hpb=f0bb6cc4846d24b0b3d67ae9329e08a387981b66;p=dcpomatic.git

diff --git a/test/remake_id_test.cc b/test/remake_id_test.cc
index 43ed16ebb..349884f91 100644
--- a/test/remake_id_test.cc
+++ b/test/remake_id_test.cc
@@ -20,7 +20,7 @@
 
 #include "lib/ffmpeg_content.h"
 #include "lib/content_factory.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include "lib/job_manager.h"
 #include "lib/film.h"
 #include "lib/dcp_content.h"
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE (remake_id_test1)
 {
 	/* Make a DCP */
 	shared_ptr<Film> film = new_test_film2 ("remake_id_test1_1");
-	shared_ptr<Content> content = content_factory(film, "test/data/flat_red.png").front();
+	shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	film->make_dcp ();
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (remake_id_test2)
 {
 	/* Make a DCP */
 	shared_ptr<Film> film = new_test_film2 ("remake_id_test2_1");
-	shared_ptr<Content> content = content_factory(film, "test/data/flat_red.png").front();
+	shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
 	film->examine_and_add_content (content);
 	film->set_encrypted (true);
 	BOOST_REQUIRE (!wait_for_jobs ());
@@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE (remake_id_test2)
 	/* Make a DKDM */
 	dcp::EncryptedKDM kdm = film->make_kdm (
 		Config::instance()->decryption_chain()->leaf(),
-		vector<dcp::Certificate>(),
+		vector<string>(),
 		*cpl,
 		dcp::LocalTime ("2012-01-01T01:00:00+00:00"),
 		dcp::LocalTime ("2112-01-01T01:00:00+00:00"),
@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE (remake_id_test2)
 
 	/* Import the DCP into a new film */
 	shared_ptr<Film> film2 = new_test_film2("remake_id_test2_2");
-	shared_ptr<DCPContent> dcp_content(new DCPContent(film2, film->dir(film->dcp_name())));
+	shared_ptr<DCPContent> dcp_content(new DCPContent(film->dir(film->dcp_name())));
 	film2->examine_and_add_content(dcp_content);
 	BOOST_REQUIRE(!wait_for_jobs());
 	dcp_content->add_kdm(kdm);