Build fixes.

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 866d09c70cf5eee7458c41d8fda72aab2dd82c99..5b296b3002f971268fdcfaf25de5bce818f2d205 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -328,7 +328,14 @@ private:
                                }
 
                                /* Encrypt */
-                               screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation())));
+                               screen_kdms.push_back (
+                                       ScreenKDM (
+                                               i,
+                                               kdm.encrypt (
+                                                       signer, i->recipient.get(), i->trusted_devices, _output->formulation(), true, 0
+                                                       )
+                                               )
+                                       );
                        }
 
                        pair<shared_ptr<Job>, int> result = _output->make (

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index f632d808aaea0a737807816a8e1b3a794a4ed32a..f1849adf675bd611681786322388c5e23a24c649 100644 (file)
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -498,6 +498,7 @@ int main (int argc, char* argv[])
                        screen_description = optarg;
                        break;
                case 'C':
+               {
                        /* Make a new screen and add it to the current cinema */
                        shared_ptr<Screen> screen (new Screen (screen_description, dcp::Certificate (dcp::file_to_string (optarg)), vector<dcp::Certificate>()));
                        if (cinema) {
@@ -505,6 +506,7 @@ int main (int argc, char* argv[])
                        }
                        screens.push_back (screen);
                        break;
+               }
                case 'T':
                        /* A trusted device ends up in the last screen we made */
                        if (!screens.empty ()) {

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 5679cf0cb14c2822338d4a78d62e03574b8e9984..64987a1210c677f406c7a9d0a887546ceddcebe5 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -140,7 +140,7 @@ KDMDialog::make_clicked ()
        DCPOMATIC_ASSERT (film);
 
        list<ScreenKDM> screen_kdms = film->make_kdms (
-               _screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation()
+               _screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation(), true, 0
                );
 
        pair<shared_ptr<Job>, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1), film->log());

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 403c1c992320edf01e635f5d6457048f79748ea3..775752c5cc1a1a1fd60371a127085346ca9746ff 100644 (file)
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -66,7 +66,8 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
                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::MODIFIED_TRANSITIONAL_1
+               dcp::MODIFIED_TRANSITIONAL_1,
+               true, 0
                );
 
        shared_ptr<Film> B = new_test_film ("import_dcp_test2");

diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index 981ed43d42d8137b8a8616d1e41bc669b8415fd7..8b6e215bade6e42fdcdfd8161eb67c008898a6e2 100644 (file)
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -66,7 +66,8 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
                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::MODIFIED_TRANSITIONAL_1
+               dcp::MODIFIED_TRANSITIONAL_1,
+               true, 0
                );
 
        /* Import A into a new project, with the required KDM, and make a VF that refers to it */
@@ -95,7 +96,8 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
                B_dcp.cpls().front()->file().get(),
                dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
                dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
-               dcp::MODIFIED_TRANSITIONAL_1
+               dcp::MODIFIED_TRANSITIONAL_1,
+               true, 0
                );
 
        /* Import the OV and VF into a new project with the KDM that was created for the VF.