X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=5046c51048ddfac577b977e70655609a6477e36d;hp=a01db9be3f4add19090834bb9d90780ddf8e8a98;hb=c04fec82d25127fafa73c3daff87bece9aa8c8e8;hpb=8b2a3f31b6b4238d8534549f495e7276174ddfba diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index a01db9be3..5046c5104 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -20,7 +20,6 @@ #include "dcp_panel.h" #include "wx_util.h" -#include "key_dialog.h" #include "isdcf_metadata_dialog.h" #include "audio_dialog.h" #include "focus_manager.h" @@ -28,6 +27,8 @@ #include "static_text.h" #include "check_box.h" #include "dcpomatic_button.h" +#include "markers_dialog.h" +#include "metadata_dialog.h" #include "lib/ratio.h" #include "lib/config.h" #include "lib/dcp_content_type.h" @@ -40,7 +41,6 @@ #include "lib/dcp_content.h" #include "lib/audio_content.h" #include -#include #include #include #include @@ -58,11 +58,18 @@ using std::max; using std::make_pair; using boost::lexical_cast; using boost::shared_ptr; +using boost::weak_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; -DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) +DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr viewer) : _audio_dialog (0) + , _markers_dialog (0) + , _metadata_dialog (0) , _film (film) + , _viewer (viewer) , _generally_sensitive (true) { _panel = new wxPanel (n); @@ -91,17 +98,12 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) _dcp_content_type_label = create_label (_panel, _("Content Type"), true); _dcp_content_type = new wxChoice (_panel, wxID_ANY); - _signed = new CheckBox (_panel, _("Signed")); _encrypted = new CheckBox (_panel, _("Encrypted")); wxClientDC dc (_panel); wxSize size = dc.GetTextExtent (wxT ("GGGGGGGG...")); size.SetHeight (-1); - _key_label = create_label (_panel, _("Key"), true); - _key = new StaticText (_panel, "", wxDefaultPosition, size); - _edit_key = new Button (_panel, _("Edit...")); - _reels_label = create_label (_panel, _("Reels"), true); _reel_type = new wxChoice (_panel, wxID_ANY); @@ -112,7 +114,8 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) _standard_label = create_label (_panel, _("Standard"), true); _standard = new wxChoice (_panel, wxID_ANY); - _upload_after_make_dcp = new CheckBox (_panel, _("Upload DCP to TMS after it is made")); + _markers = new Button (_panel, _("Markers...")); + _metadata = new Button (_panel, _("Metadata...")); _notebook = new wxNotebook (_panel, wxID_ANY); _sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6); @@ -125,13 +128,12 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) _edit_isdcf_button->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this)); _copy_isdcf_name_button->Bind(wxEVT_BUTTON, boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this)); _dcp_content_type->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::dcp_content_type_changed, this)); - _signed->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::signed_toggled, this)); _encrypted->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::encrypted_toggled, this)); - _edit_key->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::edit_key_clicked, this)); _reel_type->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::reel_type_changed, this)); _reel_length->Bind (wxEVT_SPINCTRL, boost::bind (&DCPPanel::reel_length_changed, this)); _standard->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::standard_changed, this)); - _upload_after_make_dcp->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::upload_after_make_dcp_changed, this)); + _markers->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::markers_clicked, this)); + _metadata->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::metadata_clicked, this)); BOOST_FOREACH (DCPContentType const * i, DCPContentType::all()) { _dcp_content_type->Append (std_to_wx (i->pretty_name ())); @@ -192,19 +194,10 @@ DCPPanel::add_to_grid () _grid->Add (_dcp_content_type, wxGBPosition (r, 1)); ++r; - _signed->Show (full); - if (full) { - _grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2)); - ++r; - } - _grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - _key_label->Show (full); - _key->Show (full); - _edit_key->Show (full); _reels_label->Show (full); _reel_type->Show (full); _reel_length_label->Show (full); @@ -212,20 +205,12 @@ DCPPanel::add_to_grid () _reel_length_gb_label->Show (full); _standard_label->Show (full); _standard->Show (full); - _upload_after_make_dcp->Show (full); + _markers->Show (full); + _metadata->Show (full); _reencode_j2k->Show (full); _encrypted->Show (full); if (full) { - add_label_to_sizer (_grid, _key_label, true, wxGBPosition (r, 0)); - { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_key, 1, wxALIGN_CENTER_VERTICAL); - s->Add (_edit_key); - _grid->Add (s, wxGBPosition (r, 1)); - } - ++r; - add_label_to_sizer (_grid, _reels_label, true, wxGBPosition (r, 0)); _grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); ++r; @@ -243,21 +228,14 @@ DCPPanel::add_to_grid () _grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); ++r; - _grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2)); + wxBoxSizer* extra = new wxBoxSizer (wxHORIZONTAL); + extra->Add (_markers, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP); + extra->Add (_metadata, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP); + _grid->Add (extra, wxGBPosition(r, 0), wxGBSpan(1, 2)); ++r; } } -void -DCPPanel::edit_key_clicked () -{ - KeyDialog* d = new KeyDialog (_panel, _film->key ()); - if (d->ShowModal () == wxID_OK) { - _film->set_key (d->key ()); - } - d->Destroy (); -} - void DCPPanel::name_changed () { @@ -278,16 +256,6 @@ DCPPanel::j2k_bandwidth_changed () _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000); } -void -DCPPanel::signed_toggled () -{ - if (!_film) { - return; - } - - _film->set_signed (_signed->GetValue ()); -} - void DCPPanel::encrypted_toggled () { @@ -307,9 +275,10 @@ DCPPanel::frame_rate_choice_changed () } _film->set_video_frame_rate ( - boost::lexical_cast ( - wx_to_std (_frame_rate_choice->GetString (_frame_rate_choice->GetSelection ())) - ) + boost::lexical_cast( + wx_to_std(_frame_rate_choice->GetString(_frame_rate_choice->GetSelection())) + ), + true ); } @@ -355,13 +324,27 @@ DCPPanel::standard_changed () } void -DCPPanel::upload_after_make_dcp_changed () +DCPPanel::markers_clicked () { - if (!_film) { - return; + if (_markers_dialog) { + _markers_dialog->Destroy (); + _markers_dialog = 0; + } + + _markers_dialog = new MarkersDialog (_panel, _film, _viewer); + _markers_dialog->Show(); +} + +void +DCPPanel::metadata_clicked () +{ + if (_metadata_dialog) { + _metadata_dialog->Destroy (); + _metadata_dialog = 0; } - _film->set_upload_after_make_dcp (_upload_after_make_dcp->GetValue ()); + _metadata_dialog = new MetadataDialog (_panel, _film); + _metadata_dialog->Show (); } void @@ -381,24 +364,8 @@ DCPPanel::film_changed (int p) checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ())); setup_dcp_name (); break; - case Film::SIGNED: - checked_set (_signed, _film->is_signed ()); - break; case Film::ENCRYPTED: checked_set (_encrypted, _film->encrypted ()); - if (_film->encrypted ()) { - _film->set_signed (true); - _signed->Enable (false); - _key->Enable (_generally_sensitive); - _edit_key->Enable (_generally_sensitive); - } else { - _signed->Enable (_generally_sensitive); - _key->Enable (false); - _edit_key->Enable (false); - } - break; - case Film::KEY: - checked_set (_key, _film->key().hex().substr (0, 8) + "..."); break; case Film::RESOLUTION: checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1); @@ -411,6 +378,16 @@ DCPPanel::film_changed (int p) case Film::USE_ISDCF_NAME: { checked_set (_use_isdcf_name, _film->use_isdcf_name ()); + if (_film->use_isdcf_name()) { + /* We are going back to using an ISDCF name. Remove anything after a _ in the current name, + in case the user has clicked 'Copy as name' then re-ticked 'Use ISDCF name' (#1513). + */ + string const name = _film->name (); + string::size_type const u = name.find("_"); + if (u != string::npos) { + _film->set_name (name.substr(0, u)); + } + } setup_dcp_name (); _edit_isdcf_button->Enable (_film->use_isdcf_name ()); break; @@ -457,6 +434,7 @@ DCPPanel::film_changed (int p) case Film::INTEROP: checked_set (_standard, _film->interop() ? 1 : 0); setup_dcp_name (); + _markers->Enable (!_film->interop()); break; case Film::AUDIO_PROCESSOR: if (_film->audio_processor ()) { @@ -474,11 +452,9 @@ DCPPanel::film_changed (int p) case Film::REEL_LENGTH: checked_set (_reel_length, _film->reel_length() / 1000000000LL); break; - case Film::UPLOAD_AFTER_MAKE_DCP: - checked_set (_upload_after_make_dcp, _film->upload_after_make_dcp ()); - break; case Film::CONTENT: setup_dcp_name (); + setup_sensitivity (); break; default: break; @@ -557,23 +533,36 @@ DCPPanel::dcp_content_type_changed () void DCPPanel::set_film (shared_ptr film) { - /* We are changing film, so destroy any audio dialog for the old one */ + /* We are changing film, so destroy any dialogs for the old one */ if (_audio_dialog) { _audio_dialog->Destroy (); _audio_dialog = 0; } + if (_markers_dialog) { + _markers_dialog->Destroy (); + _markers_dialog = 0; + } + if (_metadata_dialog) { + _metadata_dialog->Destroy (); + _metadata_dialog = 0; + } _film = film; + if (!_film) { + /* Really should all the film_changed below but this might be enough */ + checked_set (_dcp_name, wxT("")); + set_general_sensitivity (false); + return; + } + film_changed (Film::NAME); film_changed (Film::USE_ISDCF_NAME); film_changed (Film::CONTENT); film_changed (Film::DCP_CONTENT_TYPE); film_changed (Film::CONTAINER); film_changed (Film::RESOLUTION); - film_changed (Film::SIGNED); film_changed (Film::ENCRYPTED); - film_changed (Film::KEY); film_changed (Film::J2K_BANDWIDTH); film_changed (Film::ISDCF_METADATA); film_changed (Film::VIDEO_FRAME_RATE); @@ -584,7 +573,6 @@ DCPPanel::set_film (shared_ptr film) film_changed (Film::AUDIO_PROCESSOR); film_changed (Film::REEL_TYPE); film_changed (Film::REEL_LENGTH); - film_changed (Film::UPLOAD_AFTER_MAKE_DCP); film_changed (Film::REENCODE_J2K); set_general_sensitivity(static_cast(_film)); @@ -605,29 +593,37 @@ DCPPanel::setup_sensitivity () _edit_isdcf_button->Enable (_generally_sensitive); _dcp_content_type->Enable (_generally_sensitive); _copy_isdcf_name_button->Enable (_generally_sensitive); - - bool si = _generally_sensitive; - if (_film && _film->encrypted ()) { - si = false; - } - _signed->Enable (si); - _encrypted->Enable (_generally_sensitive); - _key->Enable (_generally_sensitive && _film && _film->encrypted ()); - _edit_key->Enable (_generally_sensitive && _film && _film->encrypted ()); _reel_type->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio()); _reel_length->Enable (_generally_sensitive && _film && _film->reel_type() == REELTYPE_BY_LENGTH); - _upload_after_make_dcp->Enable (_generally_sensitive); - _frame_rate_choice->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); - _frame_rate_spin->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); - _audio_channels->Enable (_generally_sensitive && _film && !_film->references_dcp_audio()); + _markers->Enable (_generally_sensitive && _film && !_film->interop()); + _metadata->Enable (_generally_sensitive); + _frame_rate_choice->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->contains_atmos_content()); + _frame_rate_spin->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->contains_atmos_content()); + _audio_channels->Enable (_generally_sensitive && _film && !_film->references_dcp_audio() && !_film->contains_atmos_content()); _audio_processor->Enable (_generally_sensitive && _film && !_film->references_dcp_audio()); _j2k_bandwidth->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); _container->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); - _best_frame_rate->Enable (_generally_sensitive && _film && _film->best_video_frame_rate () != _film->video_frame_rate ()); + _best_frame_rate->Enable ( + _generally_sensitive && + _film && + _film->best_video_frame_rate () != _film->video_frame_rate() && + !_film->references_dcp_video() && + !_film->contains_atmos_content() + ); _resolution->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); _three_d->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); - _standard->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio()); + + _standard->Enable ( + _generally_sensitive && + _film && + !_film->references_dcp_video() && + !_film->references_dcp_audio() && + !_film->contains_atmos_content() + ); + + _reencode_j2k->Enable (_generally_sensitive && _film); + _show_audio->Enable (_generally_sensitive && _film); } void @@ -709,6 +705,12 @@ DCPPanel::config_changed (Config::Property p) _audio_grid->Clear (); add_audio_panel_to_grid (); _audio_grid->Layout (); + } else if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) { + _audio_processor->Clear (); + add_audio_processors (); + if (_film) { + film_changed (Film::AUDIO_PROCESSOR); + } } } @@ -722,8 +724,6 @@ DCPPanel::setup_frame_rate_widget () _frame_rate_choice->Show (); _frame_rate_spin->Hide (); } - - _frame_rate_sizer->Layout (); } wxPanel * @@ -744,13 +744,9 @@ DCPPanel::make_video_panel () _frame_rate_label = create_label (panel, _("Frame Rate"), true); _frame_rate_choice = new wxChoice (panel, wxID_ANY); - _frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL); - _frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL); _frame_rate_spin = new wxSpinCtrl (panel, wxID_ANY); - _frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL); setup_frame_rate_widget (); _best_frame_rate = new Button (panel, _("Use best")); - _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL); _three_d = new CheckBox (panel, _("3D")); @@ -815,7 +811,7 @@ DCPPanel::add_video_panel_to_grid () _frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL); _frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL); _frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL); - _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL); + _frame_rate_sizer->Add (_best_frame_rate, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); _video_grid->Add (_frame_rate_sizer, wxGBPosition (r, 1)); ++r; } @@ -857,10 +853,10 @@ wxPanel * DCPPanel::make_audio_panel () { wxPanel* panel = new wxPanel (_notebook); - wxSizer* sizer = new wxBoxSizer (wxVERTICAL); + _audio_panel_sizer = new wxBoxSizer (wxVERTICAL); _audio_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - sizer->Add (_audio_grid, 0, wxALL, 8); - panel->SetSizer (sizer); + _audio_panel_sizer->Add (_audio_grid, 0, wxALL, 8); + panel->SetSizer (_audio_panel_sizer); _channels_label = create_label (panel, _("Channels"), true); _audio_channels = new wxChoice (panel, wxID_ANY); @@ -868,10 +864,7 @@ DCPPanel::make_audio_panel () _processor_label = create_label (panel, _("Processor"), true); _audio_processor = new wxChoice (panel, wxID_ANY); - _audio_processor->Append (_("None"), new wxStringClientData (N_("none"))); - BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::all ()) { - _audio_processor->Append (std_to_wx (ap->name ()), new wxStringClientData (std_to_wx (ap->id ()))); - } + add_audio_processors (); _show_audio = new Button (panel, _("Show audio...")); @@ -943,7 +936,7 @@ DCPPanel::show_audio_clicked () _audio_dialog = 0; } - AudioDialog* d = new AudioDialog (_panel, _film); + AudioDialog* d = new AudioDialog (_panel, _film, _viewer); d->Show (); } @@ -966,3 +959,13 @@ DCPPanel::reel_length_changed () _film->set_reel_length (_reel_length->GetValue() * 1000000000LL); } + +void +DCPPanel::add_audio_processors () +{ + _audio_processor->Append (_("None"), new wxStringClientData (N_("none"))); + BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::visible()) { + _audio_processor->Append (std_to_wx(ap->name()), new wxStringClientData(std_to_wx(ap->id()))); + } + _audio_panel_sizer->Layout(); +}