Fix crash with sub-sample push parts in AudioMerger.

[dcpomatic.git] / test / import_dcp_test.cc

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 1f5247392a461b6dd90033b4189a7a18c2f02b7c..16ebfa454f14b32e81b1a4b7da320bed7c5c5e36 100644 (file)
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -25,6 +25,7 @@
 
 #include "test.h"
 #include "lib/film.h"
+#include "lib/screen.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.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 ());
@@ -62,12 +64,13 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 
        Config::instance()->set_decryption_chain (shared_ptr<dcp::CertificateChain> (new dcp::CertificateChain (openssl_path ())));
 
+       /* Dear future-carl: I suck!  I thought you wouldn't still be running these tests in 2030!  Sorry! */
        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"),
+               dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
+               dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
                dcp::MODIFIED_TRANSITIONAL_1,
                true, 0
                );
@@ -78,7 +81,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);