X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=d3bbf02c998e164ec4f317a00db7c80a04d9718c;hp=40efc5411e61bfac248e8a181ecb386552d2e1a4;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=cb2546eaf5e2f109ca5309f3dc04e6c17b8037e5 diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 40efc5411..d3bbf02c9 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,7 +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")) @@ -66,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); @@ -74,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 */ @@ -106,7 +117,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) _screens->ScreensChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this)); _timing->TimingChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this)); - _make->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::make_clicked, this)); + _make->Bind (wxEVT_BUTTON, boost::bind (&KDMDialog::make_clicked, this)); setup_sensitivity (); @@ -123,70 +134,62 @@ KDMDialog::setup_sensitivity () _make->Enable (!_screens->screens().empty() && _timing->valid() && _cpl->has_selected()); } +bool +KDMDialog::confirm_overwrite (boost::filesystem::path path) +{ + return confirm_dialog ( + this, + wxString::Format (_("File %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) + ); +} + void KDMDialog::make_clicked () { shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - _output->save_kdm_name_format (); - + list kdms; try { - list screen_kdms = film->make_kdms ( - _screens->screens(), _cpl->cpl(), _timing->from(), _timing->until(), _output->formulation() - ); - - dcp::NameFormat::Map name_values; - name_values['f'] = film->name(); - name_values['b'] = dcp::LocalTime(_timing->from()).date() + " " + dcp::LocalTime(_timing->from()).time_of_day(); - name_values['e'] = dcp::LocalTime(_timing->until()).date() + " " + dcp::LocalTime(_timing->until()).time_of_day(); - - if (_output->write_to ()) { - ScreenKDM::write_files ( - screen_kdms, - _output->directory(), - _output->name_format(), - name_values - ); + /* 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(); } - if (_output->email ()) { - - list const cinema_kdms = CinemaKDMs::collect (screen_kdms); - - bool ok = true; - - if (Config::instance()->confirm_kdm_email ()) { - list emails; - BOOST_FOREACH (CinemaKDMs i, cinema_kdms) { - BOOST_FOREACH (string j, i.cinema->emails) { - emails.push_back (j); - } - } - - ConfirmKDMEmailDialog* d = new ConfirmKDMEmailDialog (this, emails); - if (d->ShowModal() == wxID_CANCEL) { - ok = false; - } - } - - if (ok) { - JobManager::instance()->add ( - shared_ptr (new SendKDMEmailJob ( - cinema_kdms, - _output->name_format(), - name_values, - film->dcp_name(), - film->log() - )) - ); + BOOST_FOREACH (shared_ptr i, _screens->screens()) { + KDMWithMetadataPtr 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::NotEncryptedError& e) { - error_dialog (this, _("CPL's content is not encrypted.")); - } catch (exception& e) { - error_dialog (this, e.what ()); - } catch (...) { - error_dialog (this, _("An unknown exception occurred.")); + } 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 (kdms, film->name(), bind (&KDMDialog::confirm_overwrite, this, _1)); + if (result.first) { + JobManager::instance()->add (result.first); + } + + if (result.second > 0) { + /* XXX: proper plural form support in wxWidgets? */ + wxString s = result.second == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s"); + message_dialog ( + this, + wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data()) + ); } }