diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-14 23:27:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-14 23:28:26 +0000 |
| commit | 142f688c0ebb6938ef2d7f2b7e7c859d12af7e23 (patch) | |
| tree | b84200a319a599f9d80b6e1fa6b46b16a64dde76 | |
| parent | fbdefe5be361c73a463c3bbe27a7e93a422435b3 (diff) | |
Build fixes.
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 9 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 2 | ||||
| -rw-r--r-- | src/wx/kdm_dialog.cc | 2 | ||||
| -rw-r--r-- | test/import_dcp_test.cc | 3 | ||||
| -rw-r--r-- | test/vf_kdm_test.cc | 6 |
5 files changed, 17 insertions, 5 deletions
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 866d09c70..5b296b300 100644 --- 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 f632d808a..f1849adf6 100644 --- 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 5679cf0cb..64987a121 100644 --- 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 403c1c992..775752c5c 100644 --- 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 981ed43d4..8b6e215ba 100644 --- 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. |