}
/* 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 (
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) {
}
screens.push_back (screen);
break;
+ }
case 'T':
/* A trusted device ends up in the last screen we made */
if (!screens.empty ()) {
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());
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");
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 */
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.