X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=71689f613c6f2663b377dcbc234079ce3d0275ed;hb=3ddc31b37c492b4a6bd0ad2bf3b5dba6a8f41850;hp=c12f15fa1e726c1c4bc411a69549931a074cdb7d;hpb=d7ac100c0eb1b5efdcfbec59be870fd869252840;p=dcpomatic.git

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index c12f15fa1..71689f613 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -25,7 +25,8 @@
 
 #include "test.h"
 #include "lib/film.h"
-#include "lib/dcp_text_content.h"
+#include "lib/screen.h"
+#include "lib/dcp_subtitle_content.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_content.h"
@@ -38,6 +39,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::vector;
+using std::string;
 using boost::shared_ptr;
 
 /** Make an encrypted DCP, import it and make a new unencrypted DCP */
@@ -49,7 +51,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 	A->set_name ("frobozz");
 	A->set_interop (false);
 
-	shared_ptr<FFmpegContent> c (new FFmpegContent (A, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
 	A->examine_and_add_content (c);
 	A->set_encrypted (true);
 	BOOST_CHECK (!wait_for_jobs ());
@@ -64,7 +66,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 
 	dcp::EncryptedKDM kdm = A->make_kdm (
 		Config::instance()->decryption_chain()->leaf (),
-		vector<dcp::Certificate> (),
+		vector<string>(),
 		A_dcp.cpls().front()->file().get(),
 		dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
 		dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
@@ -78,7 +80,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 	B->set_name ("frobozz");
 	B->set_interop (false);
 
-	shared_ptr<DCPContent> d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name()));
+	shared_ptr<DCPContent> d (new DCPContent("build/test/import_dcp_test/" + A->dcp_name()));
 	B->examine_and_add_content (d);
 	BOOST_CHECK (!wait_for_jobs ());
 	d->add_kdm (kdm);