Take Film pointer out of Content.

[dcpomatic.git] / test / vf_kdm_test.cc

diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index 8b6e215bade6e42fdcdfd8161eb67c008898a6e2..9b48f9b28633a6876b5f32e213047956868d9136 100644 (file)
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -32,10 +32,12 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/config.h"
 #include "lib/cross.h"
+#include "lib/screen.h"
 #include <dcp/cpl.h>
 #include <boost/test/unit_test.hpp>
 
 using std::vector;
+using std::string;
 using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (vf_kdm_test)
@@ -48,7 +50,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
        A->set_name ("frobozz");
        A->set_interop (true);
 
-       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);
        wait_for_jobs ();
@@ -62,7 +64,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 
        dcp::EncryptedKDM A_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 (vf_kdm_test)
        B->set_name ("frobozz");
        B->set_interop (true);
 
-       shared_ptr<DCPContent> d (new DCPContent (B, "build/test/vf_kdm_test_ov/" + A->dcp_name()));
+       shared_ptr<DCPContent> d (new DCPContent ("build/test/vf_kdm_test_ov/" + A->dcp_name()));
        d->add_kdm (A_kdm);
        d->set_reference_video (true);
        B->examine_and_add_content (d);
@@ -92,7 +94,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 
        dcp::EncryptedKDM B_kdm = B->make_kdm (
                Config::instance()->decryption_chain()->leaf (),
-               vector<dcp::Certificate> (),
+               vector<string>(),
                B_dcp.cpls().front()->file().get(),
                dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
                dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
@@ -110,7 +112,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
        C->set_name ("frobozz");
        C->set_interop (true);
 
-       shared_ptr<DCPContent> e (new DCPContent (C, "build/test/vf_kdm_test_vf/" + B->dcp_name()));
+       shared_ptr<DCPContent> e (new DCPContent ("build/test/vf_kdm_test_vf/" + B->dcp_name()));
        e->add_kdm (B_kdm);
        e->add_ov ("build/test/vf_kdm_test_ov/" + A->dcp_name());
        C->examine_and_add_content (e);