X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=d74741871a63213fefbdd8419b506f7f7b9146e6;hp=5679cf0cb14c2822338d4a78d62e03574b8e9984;hb=0a1d944d74308ccb940194bcb627652c72128650;hpb=e340b96b4a33725e70e3703b0c60ba8da95bca3b diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 5679cf0cb..d74741871 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -25,12 +25,12 @@ #include "kdm_output_panel.h" #include "kdm_cpl_panel.h" #include "confirm_kdm_email_dialog.h" +#include "static_text.h" +#include "dcpomatic_button.h" #include "lib/film.h" #include "lib/screen.h" -#include "lib/screen_kdm.h" -#include "lib/send_kdm_email_job.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 @@ -47,8 +47,10 @@ using std::pair; using std::cout; using std::vector; using std::make_pair; +using std::runtime_error; using boost::shared_ptr; using boost::bind; +using boost::optional; KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) : wxDialog (parent, wxID_ANY, _("Make KDMs")) @@ -67,7 +69,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) subheading_font.SetWeight (wxFONTWEIGHT_BOLD); /* Sub-heading: Screens */ - wxStaticText* h = new wxStaticText (this, wxID_ANY, _("Screens")); + wxStaticText* h = new StaticText (this, _("Screens")); h->SetFont (subheading_font); left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); _screens = new ScreensPanel (this); @@ -75,27 +77,35 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) /* Sub-heading: Timing */ /// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix - h = new wxStaticText (this, wxID_ANY, S_("KDM|Timing")); + h = new StaticText (this, S_("KDM|Timing")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); _timing = new KDMTimingPanel (this); right->Add (_timing); /* Sub-heading: CPL */ - h = new wxStaticText (this, wxID_ANY, _("CPL")); + h = new StaticText (this, _("CPL")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); - _cpl = new KDMCPLPanel (this, film->cpls ()); + + vector cpls; + BOOST_FOREACH (CPLSummary const & i, film->cpls()) { + if (i.encrypted) { + cpls.push_back (i); + } + } + + _cpl = new KDMCPLPanel (this, cpls); right->Add (_cpl, 0, wxEXPAND); /* Sub-heading: Output */ - h = new wxStaticText (this, wxID_ANY, _("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 (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); - _make = new wxButton (this, wxID_ANY, _("Make KDMs")); + _make = new Button (this, _("Make KDMs")); right->Add (_make, 0, wxTOP | wxBOTTOM, DCPOMATIC_SIZER_GAP); /* Make an overall sizer to get a nice border */ @@ -139,11 +149,61 @@ KDMDialog::make_clicked () shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - list screen_kdms = film->make_kdms ( - _screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation() - ); + list kdms; + try { + /* Start off by enabling forensic marking for all */ + optional for_audio; + if (!_output->forensic_mark_audio()) { + /* No forensic marking for audio */ + for_audio = 0; + } else if (_output->forensic_mark_audio_up_to()) { + /* Forensic mark up to this channel; disabled on channels greater than this */ + for_audio = _output->forensic_mark_audio_up_to(); + } + + BOOST_FOREACH (shared_ptr i, _screens->screens()) { + if (i->recipient) { + dcp::LocalTime const begin(_timing->from(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0); + dcp::LocalTime const end(_timing->until(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0); + + dcp::EncryptedKDM const kdm = film->make_kdm ( + i->recipient.get(), + i->trusted_device_thumbprints(), + _cpl->cpl(), + begin, + end, + _output->formulation(), + !_output->forensic_mark_video(), + for_audio + ); + + dcp::NameFormat::Map name_values; + if (i->cinema) { + name_values['c'] = i->cinema->name; + } + name_values['s'] = i->name; + name_values['f'] = film->name(); + name_values['b'] = dcp::LocalTime(begin).date() + " " + dcp::LocalTime(begin).time_of_day(false, false); + name_values['e'] = dcp::LocalTime(end).date() + " " + dcp::LocalTime(end).time_of_day(false, false); + name_values['i'] = kdm.cpl_id(); + + kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm))); + } + } + + } 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.")); + } + return; + } catch (runtime_error& e) { + error_dialog (this, std_to_wx(e.what())); + return; + } - pair, int> result = _output->make (screen_kdms, film->name(), _timing, bind (&KDMDialog::confirm_overwrite, this, _1), film->log()); + pair, int> result = _output->make (kdms, film->name(), bind (&KDMDialog::confirm_overwrite, this, _1)); if (result.first) { JobManager::instance()->add (result.first); }