X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=d3bbf02c998e164ec4f317a00db7c80a04d9718c;hp=e9ad96b8d34f741c75436ab22436a161d30c95c3;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=bdd2c3396318d64a7c1c2ad870e1ba7a1352c16d diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index e9ad96b8d..d3bbf02c9 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -1,164 +1,123 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "kdm_dialog.h" -#include "cinema_dialog.h" -#include "screen_dialog.h" #include "wx_util.h" #include "screens_panel.h" #include "kdm_timing_panel.h" -#include "lib/cinema.h" -#include "lib/config.h" +#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/kdm_with_metadata.h" +#include "lib/job_manager.h" +#include "lib/config.h" +#include "lib/cinema.h" #include -#ifdef DCPOMATIC_USE_OWN_DIR_PICKER -#include "dir_picker_ctrl.h" -#else -#include -#endif +#include #include -#include #include #include 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::runtime_error; using boost::shared_ptr; +using boost::bind; +using boost::optional; -KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) +KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) : wxDialog (parent, wxID_ANY, _("Make KDMs")) + , _film (film) { - /* Main sizer */ - wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL); + /* Main sizers */ + wxBoxSizer* horizontal = new wxBoxSizer (wxHORIZONTAL); + wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); + wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); + + horizontal->Add (left, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP * 4); + horizontal->Add (right, 1, wxEXPAND); /* Font for sub-headings */ wxFont subheading_font (*wxNORMAL_FONT); 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); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL); + left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); _screens = new ScreensPanel (this); - vertical->Add (_screens, 1, wxEXPAND); + left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); /* Sub-heading: Timing */ - h = new wxStaticText (this, wxID_ANY, S_("KDM|Timing")); + /// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix + h = new StaticText (this, S_("KDM|Timing")); h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); _timing = new KDMTimingPanel (this); - vertical->Add (_timing); + right->Add (_timing); /* Sub-heading: CPL */ - h = new wxStaticText (this, wxID_ANY, _("CPL")); + h = new StaticText (this, _("CPL")); h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); - - /* CPL choice */ - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - add_label_to_sizer (s, this, _("CPL"), true); - _cpl = new wxChoice (this, wxID_ANY); - s->Add (_cpl, 1, wxEXPAND); - _cpl_browse = new wxButton (this, wxID_ANY, _("Browse...")); - s->Add (_cpl_browse, 0); - vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2); + right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); - /* CPL details */ - wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - add_label_to_sizer (table, this, _("DCP directory"), true); - _dcp_directory = new wxStaticText (this, wxID_ANY, ""); - table->Add (_dcp_directory); - add_label_to_sizer (table, this, _("CPL ID"), true); - _cpl_id = new wxStaticText (this, wxID_ANY, ""); - table->Add (_cpl_id); - add_label_to_sizer (table, this, _("CPL annotation text"), true); - _cpl_annotation_text = new wxStaticText (this, wxID_ANY, ""); - table->Add (_cpl_annotation_text); - vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2); - - _cpls = film->cpls (); - update_cpl_choice (); + 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); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); - - table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); - - add_label_to_sizer (table, this, _("KDM type"), true); - _type = new wxChoice (this, wxID_ANY); - _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1)); - if (!film->interop ()) { - _type->Append ("DCI Any", ((void *) dcp::DCI_ANY)); - _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC)); - } - table->Add (_type, 1, wxEXPAND); - _type->SetSelection (0); - - _write_to = new wxRadioButton (this, wxID_ANY, _("Write to")); - table->Add (_write_to, 1, wxEXPAND); - -#ifdef DCPOMATIC_USE_OWN_DIR_PICKER - _folder = new DirPickerCtrl (this); -#else - _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); -#endif - - _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); - - table->Add (_folder, 1, wxEXPAND); + 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); - _email = new wxRadioButton (this, wxID_ANY, _("Send by email")); - table->Add (_email, 1, wxEXPAND); - table->AddSpacer (0); + _make = new Button (this, _("Make KDMs")); + right->Add (_make, 0, wxTOP | wxBOTTOM, DCPOMATIC_SIZER_GAP); - vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); - - /* Make an overall sizer to get a nice border, and put some buttons in */ + /* Make an overall sizer to get a nice border */ wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); - overall_sizer->Add (vertical, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER); - - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); - if (buttons) { - overall_sizer->Add (buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); - } - - _write_to->SetValue (true); + overall_sizer->Add (horizontal, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER); /* Bind */ _screens->ScreensChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this)); - - _cpl->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&KDMDialog::update_cpl_summary, this)); - _cpl_browse->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::cpl_browse_clicked, this)); - - _write_to->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&KDMDialog::setup_sensitivity, this)); - _email->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&KDMDialog::setup_sensitivity, this)); + _timing->TimingChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this)); + _make->Bind (wxEVT_BUTTON, boost::bind (&KDMDialog::make_clicked, this)); setup_sensitivity (); @@ -171,123 +130,66 @@ void KDMDialog::setup_sensitivity () { _screens->setup_sensitivity (); - - bool const sd = _cpl->GetSelection() != -1; - - wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); - if (ok) { - ok->Enable (!_screens->screens().empty() && sd); - } - - _folder->Enable (_write_to->GetValue ()); -} - -boost::filesystem::path -KDMDialog::cpl () const -{ - int const item = _cpl->GetSelection (); - DCPOMATIC_ASSERT (item >= 0); - return _cpls[item].cpl_file; -} - -boost::filesystem::path -KDMDialog::directory () const -{ - return wx_to_std (_folder->GetPath ()); + _output->setup_sensitivity (); + _make->Enable (!_screens->screens().empty() && _timing->valid() && _cpl->has_selected()); } bool -KDMDialog::write_to () const +KDMDialog::confirm_overwrite (boost::filesystem::path path) { - return _write_to->GetValue (); -} - -dcp::Formulation -KDMDialog::formulation () const -{ - return (dcp::Formulation) reinterpret_cast (_type->GetClientData (_type->GetSelection())); + return confirm_dialog ( + this, + wxString::Format (_("File %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) + ); } void -KDMDialog::update_cpl_choice () +KDMDialog::make_clicked () { - _cpl->Clear (); + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); - for (vector::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { - _cpl->Append (std_to_wx (i->cpl_id)); - - if (_cpls.size() > 0) { - _cpl->SetSelection (0); + 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(); } - } - - update_cpl_summary (); -} -void -KDMDialog::update_cpl_summary () -{ - int const n = _cpl->GetSelection(); - if (n == wxNOT_FOUND) { + 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::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; - } - - _dcp_directory->SetLabel (std_to_wx (_cpls[n].dcp_directory)); - _cpl_id->SetLabel (std_to_wx (_cpls[n].cpl_id)); - _cpl_annotation_text->SetLabel (std_to_wx (_cpls[n].cpl_annotation_text)); -} - -void -KDMDialog::cpl_browse_clicked () -{ - wxFileDialog* d = new wxFileDialog (this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, "*.xml"); - if (d->ShowModal() == wxID_CANCEL) { - d->Destroy (); + } catch (runtime_error& e) { + error_dialog (this, std_to_wx(e.what())); return; } - boost::filesystem::path cpl_file (wx_to_std (d->GetPath ())); - boost::filesystem::path dcp_dir = cpl_file.parent_path (); - - d->Destroy (); - - /* XXX: hack alert */ - cxml::Document cpl_document ("CompositionPlaylist"); - cpl_document.read_file (cpl_file); + pair, int> result = _output->make (kdms, film->name(), bind (&KDMDialog::confirm_overwrite, this, _1)); + if (result.first) { + JobManager::instance()->add (result.first); + } - try { - _cpls.push_back ( - CPLSummary ( - dcp_dir.filename().string(), - cpl_document.string_child("Id").substr (9), - cpl_document.string_child ("ContentTitleText"), - cpl_file - ) + 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()) ); - } catch (cxml::Error) { - error_dialog (this, _("This is not a valid CPL file")); - return; } - - update_cpl_choice (); - _cpl->SetSelection (_cpls.size() - 1); - update_cpl_summary (); -} - -list > -KDMDialog::screens () const -{ - return _screens->screens (); -} - -boost::posix_time::ptime -KDMDialog::from () const -{ - return _timing->from (); -} - -boost::posix_time::ptime -KDMDialog::until () const -{ - return _timing->until (); }