diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 3 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 4d6a289b5..3d74859dc 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -55,6 +55,7 @@ #include "lib/version.h" #include "lib/signal_manager.h" #include "lib/log.h" +#include "lib/screen.h" #include "lib/job_manager.h" #include "lib/exceptions.h" #include "lib/cinema.h" @@ -823,7 +824,7 @@ private: try { kdm = _film->make_kdm ( Config::instance()->decryption_chain()->leaf(), - vector<dcp::Certificate> (), + vector<string>(), d->cpl (), dcp::LocalTime ("2012-01-01T01:00:00+00:00"), dcp::LocalTime ("2112-01-01T01:00:00+00:00"), diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 184319a5f..e901d2d0c 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -332,7 +332,7 @@ private: ScreenKDM ( i, kdm.encrypt ( - signer, i->recipient.get(), i->trusted_devices, _output->formulation(), + signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(), !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0 ) ) diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index f1849adf6..3dc3f21b0 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -273,7 +273,7 @@ dcp::EncryptedKDM kdm_from_dkdm ( dcp::DecryptedKDM dkdm, dcp::Certificate target, - vector<dcp::Certificate> trusted_devices, + vector<string> trusted_devices, dcp::LocalTime valid_from, dcp::LocalTime valid_to, dcp::Formulation formulation, @@ -337,7 +337,7 @@ from_dkdm ( kdm_from_dkdm ( dkdm, i->recipient.get(), - i->trusted_devices, + i->trusted_device_thumbprints(), dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), formulation, @@ -500,7 +500,7 @@ int main (int argc, char* argv[]) 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>())); + shared_ptr<Screen> screen (new Screen (screen_description, dcp::Certificate (dcp::file_to_string (optarg)), vector<TrustedDevice>())); if (cinema) { cinema->add_screen (screen); } @@ -510,7 +510,7 @@ int main (int argc, char* argv[]) case 'T': /* A trusted device ends up in the last screen we made */ if (!screens.empty ()) { - screens.back()->trusted_devices.push_back (dcp::Certificate (dcp::file_to_string (optarg))); + screens.back()->trusted_devices.push_back(TrustedDevice(dcp::Certificate(dcp::file_to_string(optarg)))); } break; case 'B': |