diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-03-26 23:29:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-03-27 00:30:25 +0100 |
| commit | ce01ccc1aa871d299ad96683055c4e06a355efb9 (patch) | |
| tree | 781c9e4549cddd5e88d5197518b86b144cedc16f /src/lib | |
| parent | 2a7e446d1ae0e80b690fada2d60c55fd829d107f (diff) | |
Remove timing selection from DKDM dialog.
Maybe there is some software that respects the timings, but it seems
slightly deceptive to pretend there's any point in setting them.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dkdm_recipient.cc | 13 | ||||
| -rw-r--r-- | src/lib/dkdm_recipient.h | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc index bd14aedea..c68c915d5 100644 --- a/src/lib/dkdm_recipient.cc +++ b/src/lib/dkdm_recipient.cc @@ -36,9 +36,7 @@ KDMWithMetadataPtr kdm_for_dkdm_recipient ( shared_ptr<const Film> film, boost::filesystem::path cpl, - DKDMRecipient const& recipient, - dcp::LocalTime valid_from, - dcp::LocalTime valid_to + DKDMRecipient const& recipient ) { if (!recipient.recipient()) { @@ -50,13 +48,16 @@ kdm_for_dkdm_recipient ( throw InvalidSignerError(); } - auto const decrypted_kdm = film->make_kdm(cpl, valid_from, valid_to); + auto start = signer->leaf().not_before(); + start.add_days(1); + auto end = signer->leaf().not_after(); + end.add_days(-1); + + auto const decrypted_kdm = film->make_kdm(cpl, start, end); auto const kdm = decrypted_kdm.encrypt(signer, recipient.recipient().get(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0); dcp::NameFormat::Map name_values; name_values['f'] = kdm.content_title_text(); - name_values['b'] = valid_from.date() + " " + valid_from.time_of_day(true, false); - name_values['e'] = valid_to.date() + " " + valid_to.time_of_day(true, false); name_values['i'] = kdm.cpl_id(); return make_shared<KDMWithMetadata>(name_values, CinemaID(0), recipient.emails, kdm); diff --git a/src/lib/dkdm_recipient.h b/src/lib/dkdm_recipient.h index 64da41cff..cf0474354 100644 --- a/src/lib/dkdm_recipient.h +++ b/src/lib/dkdm_recipient.h @@ -49,8 +49,6 @@ KDMWithMetadataPtr kdm_for_dkdm_recipient ( std::shared_ptr<const Film> film, boost::filesystem::path cpl, - DKDMRecipient const& recipient, - dcp::LocalTime valid_from, - dcp::LocalTime valid_to + DKDMRecipient const& recipient ); |