Supporters update.

[dcpomatic.git] / test / import_dcp_test.cc

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 874e3d418333eb456d23c0d1617e780ba5865243..7387c7be7379f533687fbd58aaa1769985eca8d2 100644 (file)
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -26,6 +26,7 @@
 
 
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
@@ -46,7 +47,6 @@
 using std::dynamic_pointer_cast;
 using std::make_shared;
 using std::map;
-using std::shared_ptr;
 using std::string;
 using std::vector;
 
@@ -74,21 +74,18 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 
        Config::instance()->set_decryption_chain (make_shared<dcp::CertificateChain>(openssl_path(), CERTIFICATE_VALIDITY_PERIOD));
 
-       auto kdm = A->make_kdm (
-               Config::instance()->decryption_chain()->leaf (),
-               vector<string>(),
-               A_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 = A->make_kdm(A_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);
 
        auto B = new_test_film ("import_dcp_test2");
        B->set_container (Ratio::from_id ("185"));
        B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        B->set_name ("frobozz");
        B->set_interop (false);
+       B->set_audio_channels(16);
 
        auto d = make_shared<DCPContent>("build/test/import_dcp_test/" + A->dcp_name());
        B->examine_and_add_content (d);