X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=c7be1862256c3c79ba974a083fbbafdd78d53304;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=59d961e6c9d1e226cf7790c0af252c72cb43bb48;hpb=08f96200aacf9f91ef3e3f5b80224a5b2437f279;p=dcpomatic.git diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 59d961e6c..c7be18622 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -18,49 +18,55 @@ */ + +#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/screen_kdm.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/screen.h" +#include "lib/warnings.h" #include #include -#include +DCPOMATIC_DISABLE_WARNINGS #include -#include +#include +DCPOMATIC_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 +76,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 +86,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 +108,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_SIZER_Y_GAP * 2); + _output = new KDMOutputPanel (this); right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); _make = new Button (this, _("Make KDMs")); @@ -111,7 +117,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 +133,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) overall_sizer->SetSizeHints (this); } + void KDMDialog::setup_sensitivity () { @@ -135,6 +142,7 @@ KDMDialog::setup_sensitivity () _make->Enable (!_screens->screens().empty() && _timing->valid() && _cpl->has_selected()); } + bool KDMDialog::confirm_overwrite (boost::filesystem::path path) { @@ -144,13 +152,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,23 +171,12 @@ 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 (shared_ptr(new DCPScreenKDM(i, kdm))); + for (auto i: _screens->screens()) { + auto p = kdm_for_screen (film, _cpl->cpl(), i, _timing->from(), _timing->until(), _output->formulation(), !_output->forensic_mark_video(), for_audio); + if (p) { + kdms.push_back (p); } } - } 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.")); @@ -191,7 +189,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); }