X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=bec880852748c052c4de42eea3a40d457659fe2a;hb=6ebec6b3ca11a7062ae19176096b1b157275d015;hp=b067ff04afd36ce132196853cc3f30e28dbba2c0;hpb=ca56871d4860b8ead384c410fe374c2fa993f88f;p=dcpomatic.git diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index b067ff04a..bec880852 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -18,49 +18,56 @@ */ + +#include "confirm_kdm_email_dialog.h" +#include "dcpomatic_button.h" +#include "kdm_cpl_panel.h" #include "kdm_dialog.h" -#include "wx_util.h" -#include "screens_panel.h" -#include "kdm_timing_panel.h" #include "kdm_output_panel.h" -#include "kdm_cpl_panel.h" -#include "confirm_kdm_email_dialog.h" +#include "kdm_timing_panel.h" +#include "screens_panel.h" #include "static_text.h" -#include "dcpomatic_button.h" +#include "wx_util.h" +#include "lib/cinema.h" +#include "lib/config.h" #include "lib/film.h" -#include "lib/screen.h" -#include "lib/kdm_with_metadata.h" #include "lib/job_manager.h" -#include "lib/cinema_kdms.h" -#include "lib/config.h" -#include "lib/cinema.h" +#include "lib/kdm_with_metadata.h" +#include "lib/kdm_util.h" +#include "lib/screen.h" #include #include -#include +#include +LIBDCP_DISABLE_WARNINGS #include -#include +#include +LIBDCP_ENABLE_WARNINGS + -using std::string; using std::exception; -using std::map; using std::list; -using std::pair; -using std::cout; -using std::vector; using std::make_pair; +using std::map; +using std::pair; using std::runtime_error; -using boost::shared_ptr; +using std::shared_ptr; +using std::string; +using std::vector; using boost::bind; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) : wxDialog (parent, wxID_ANY, _("Make KDMs")) , _film (film) { /* Main sizers */ - wxBoxSizer* horizontal = new wxBoxSizer (wxHORIZONTAL); - wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); - wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); + auto horizontal = new wxBoxSizer (wxHORIZONTAL); + auto left = new wxBoxSizer (wxVERTICAL); + auto right = new wxBoxSizer (wxVERTICAL); horizontal->Add (left, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP * 4); horizontal->Add (right, 1, wxEXPAND); @@ -70,9 +77,9 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) subheading_font.SetWeight (wxFONTWEIGHT_BOLD); /* Sub-heading: Screens */ - wxStaticText* h = new StaticText (this, _("Screens")); + auto h = new StaticText (this, _("Screens")); h->SetFont (subheading_font); - left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); + left->Add (h, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); _screens = new ScreensPanel (this); left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); @@ -80,17 +87,17 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) /// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix h = new StaticText (this, S_("KDM|Timing")); h->SetFont (subheading_font); - right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add (h); _timing = new KDMTimingPanel (this); right->Add (_timing); /* Sub-heading: CPL */ h = new StaticText (this, _("CPL")); h->SetFont (subheading_font); - right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add (h); vector cpls; - BOOST_FOREACH (CPLSummary const & i, film->cpls()) { + for (auto const& i: film->cpls()) { if (i.encrypted) { cpls.push_back (i); } @@ -102,8 +109,8 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) /* Sub-heading: Output */ h = new StaticText (this, _("Output")); h->SetFont (subheading_font); - right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); - _output = new KDMOutputPanel (this, film->interop ()); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); + _output = new KDMOutputPanel (this); right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); _make = new Button (this, _("Make KDMs")); @@ -111,7 +118,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) /* Make an overall sizer to get a nice border */ - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + auto overall_sizer = new wxBoxSizer (wxVERTICAL); overall_sizer->Add (horizontal, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER); /* Bind */ @@ -127,6 +134,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) overall_sizer->SetSizeHints (this); } + void KDMDialog::setup_sensitivity () { @@ -135,6 +143,7 @@ KDMDialog::setup_sensitivity () _make->Enable (!_screens->screens().empty() && _timing->valid() && _cpl->has_selected()); } + bool KDMDialog::confirm_overwrite (boost::filesystem::path path) { @@ -144,13 +153,14 @@ KDMDialog::confirm_overwrite (boost::filesystem::path path) ); } + void KDMDialog::make_clicked () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); DCPOMATIC_ASSERT (film); - list screen_kdms; + list kdms; try { /* Start off by enabling forensic marking for all */ optional for_audio; @@ -162,28 +172,39 @@ KDMDialog::make_clicked () for_audio = _output->forensic_mark_audio_up_to(); } - BOOST_FOREACH (shared_ptr i, _screens->screens()) { - if (i->recipient) { - dcp::EncryptedKDM const kdm = film->make_kdm ( - i->recipient.get(), - i->trusted_device_thumbprints(), - _cpl->cpl(), - dcp::LocalTime(_timing->from(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0), - dcp::LocalTime(_timing->until(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0), - _output->formulation(), - !_output->forensic_mark_video(), - for_audio - ); - - screen_kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(i, kdm))); + vector period_checks; + + std::function make_kdm = [film, this](dcp::LocalTime begin, dcp::LocalTime end) { + return film->make_kdm(_cpl->cpl(), begin, end); + }; + + for (auto i: _screens->screens()) { + auto p = kdm_for_screen(make_kdm, i, _timing->from(), _timing->until(), _output->formulation(), !_output->forensic_mark_video(), for_audio, period_checks); + if (p) { + kdms.push_back (p); } } + if (find(period_checks.begin(), period_checks.end(), KDMCertificatePeriod::KDM_OUTSIDE_CERTIFICATE) != period_checks.end()) { + error_dialog( + this, + _("Some KDMs would have validity periods which are completely outside the recipient certificate periods. Such KDMs are very unlikely to work, so will not be created.") + ); + return; + } + + if (find(period_checks.begin(), period_checks.end(), KDMCertificatePeriod::KDM_OVERLAPS_CERTIFICATE) != period_checks.end()) { + message_dialog( + this, + _("For some of these KDMs the recipient certificate's validity period will not cover the whole of the KDM validity period. This might cause problems with the KDMs.") + ); + } + } catch (dcp::BadKDMDateError& e) { if (e.starts_too_early()) { error_dialog (this, _("The KDM start period is before (or close to) the start of the signing certificate's validity period. Use a later start time for this KDM.")); } else { - error_dialog (this, _("The KDM end period is after (or close to) the end of the signing certficates' validity period. Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window.")); + error_dialog (this, _("The KDM end period is after (or close to) the end of the signing certificates' validity period. Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window.")); } return; } catch (runtime_error& e) { @@ -191,7 +212,7 @@ KDMDialog::make_clicked () return; } - pair, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1)); + auto result = _output->make (kdms, film->name(), bind (&KDMDialog::confirm_overwrite, this, _1)); if (result.first) { JobManager::instance()->add (result.first); }