X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=8501eae9ce8b62909297f7b0c7a4e61d6e4976df;hb=a6696b9a58c14d81f0ae30482051c2cd47a004db;hp=c4a14a58b3a118bec1c36c4356aea4a1d1c84632;hpb=a9dde34b8772ef8b985af067e2ff709be4e3cab6;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index c4a14a58b..8501eae9c 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 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" @@ -29,7 +28,8 @@ #include "check_box.h" #include "dcpomatic_button.h" #include "markers_dialog.h" -#include "metadata_dialog.h" +#include "interop_metadata_dialog.h" +#include "smpte_metadata_dialog.h" #include "lib/ratio.h" #include "lib/config.h" #include "lib/dcp_content_type.h" @@ -42,13 +42,11 @@ #include "lib/dcp_content.h" #include "lib/audio_content.h" #include -#include #include #include #include #include #include -#include #include using std::cout; @@ -59,14 +57,18 @@ using std::pair; using std::max; using std::make_pair; using boost::lexical_cast; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr viewer) : _audio_dialog (0) , _markers_dialog (0) - , _metadata_dialog (0) + , _interop_metadata_dialog (0) + , _smpte_metadata_dialog (0) , _film (film) , _viewer (viewer) , _generally_sensitive (true) @@ -97,17 +99,12 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v _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...")); + auto 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); @@ -118,8 +115,6 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v _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...")); @@ -134,17 +129,14 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v _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()) { + for (auto i: DCPContentType::all()) { _dcp_content_type->Append (std_to_wx (i->pretty_name ())); } @@ -166,12 +158,12 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v void DCPPanel::add_to_grid () { - Config::Interface interface = Config::instance()->interface_complexity (); - int r = 0; - add_label_to_sizer (_grid, _name_label, true, wxGBPosition (r, 0)); - _grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT); + auto name_sizer = new wxBoxSizer (wxHORIZONTAL); + name_sizer->Add (_name_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + name_sizer->Add (_name, 1, wxALIGN_CENTER_VERTICAL); + _grid->Add (name_sizer, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND); ++r; int flags = wxALIGN_CENTER_VERTICAL; @@ -179,22 +171,14 @@ DCPPanel::add_to_grid () flags |= wxALIGN_RIGHT; #endif - bool const full = interface == Config::INTERFACE_FULL; - - _use_isdcf_name->Show (full); - _edit_isdcf_button->Show (full); - _copy_isdcf_name_button->Show (full); - - if (full) { - _grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags); - { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_edit_isdcf_button, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP); - s->Add (_copy_isdcf_name_button, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP); - _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND); - } - ++r; + _grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_edit_isdcf_button, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP); + s->Add (_copy_isdcf_name_button, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP); + _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND); } + ++r; _grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND); ++r; @@ -203,78 +187,31 @@ 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; + add_label_to_sizer (_grid, _reels_label, true, wxGBPosition (r, 0)); + _grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + ++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); - _reel_length->Show (full); - _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; - - add_label_to_sizer (_grid, _reel_length_label, true, wxGBPosition (r, 0)); - { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_reel_length); - add_label_to_sizer (s, _reel_length_gb_label, false); - _grid->Add (s, wxGBPosition (r, 1)); - } - ++r; - - add_label_to_sizer (_grid, _standard_label, true, wxGBPosition (r, 0)); - _grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - ++r; - - _grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2)); - ++r; - - 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; + add_label_to_sizer (_grid, _reel_length_label, true, wxGBPosition (r, 0)); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_reel_length); + add_label_to_sizer (s, _reel_length_gb_label, false, 0, wxLEFT | wxALIGN_CENTER_VERTICAL); + _grid->Add (s, wxGBPosition (r, 1)); } -} + ++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 (); + add_label_to_sizer (_grid, _standard_label, true, wxGBPosition (r, 0)); + _grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + ++r; + + auto 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 @@ -297,16 +234,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 () { @@ -361,7 +288,7 @@ DCPPanel::resolution_changed () return; } - _film->set_resolution (_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K); + _film->set_resolution (_resolution->GetSelection() == 0 ? Resolution::TWO_K : Resolution::FOUR_K); } void @@ -374,16 +301,6 @@ DCPPanel::standard_changed () _film->set_interop (_standard->GetSelection() == 1); } -void -DCPPanel::upload_after_make_dcp_changed () -{ - if (!_film) { - return; - } - - _film->set_upload_after_make_dcp (_upload_after_make_dcp->GetValue ()); -} - void DCPPanel::markers_clicked () { @@ -399,60 +316,54 @@ DCPPanel::markers_clicked () void DCPPanel::metadata_clicked () { - if (_metadata_dialog) { - _metadata_dialog->Destroy (); - _metadata_dialog = 0; - } + if (_film->interop()) { + if (_interop_metadata_dialog) { + _interop_metadata_dialog->Destroy (); + _interop_metadata_dialog = 0; + } + + _interop_metadata_dialog = new InteropMetadataDialog (_panel, _film); + _interop_metadata_dialog->Show (); + } else { + if (_smpte_metadata_dialog) { + _smpte_metadata_dialog->Destroy (); + _smpte_metadata_dialog = 0; + } - _metadata_dialog = new MetadataDialog (_panel, _film); - _metadata_dialog->Show (); + _smpte_metadata_dialog = new SMPTEMetadataDialog (_panel, _film); + _smpte_metadata_dialog->Show (); + } } void -DCPPanel::film_changed (int p) +DCPPanel::film_changed (Film::Property p) { switch (p) { - case Film::NONE: + case Film::Property::NONE: break; - case Film::CONTAINER: + case Film::Property::CONTAINER: setup_container (); break; - case Film::NAME: + case Film::Property::NAME: checked_set (_name, _film->name()); setup_dcp_name (); break; - case Film::DCP_CONTENT_TYPE: + case Film::Property::DCP_CONTENT_TYPE: 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: + case Film::Property::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); + case Film::Property::RESOLUTION: + checked_set (_resolution, _film->resolution() == Resolution::TWO_K ? 0 : 1); setup_container (); setup_dcp_name (); break; - case Film::J2K_BANDWIDTH: + case Film::Property::J2K_BANDWIDTH: checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000); break; - case Film::USE_ISDCF_NAME: + case Film::Property::USE_ISDCF_NAME: { checked_set (_use_isdcf_name, _film->use_isdcf_name ()); if (_film->use_isdcf_name()) { @@ -469,10 +380,10 @@ DCPPanel::film_changed (int p) _edit_isdcf_button->Enable (_film->use_isdcf_name ()); break; } - case Film::ISDCF_METADATA: + case Film::Property::ISDCF_METADATA: setup_dcp_name (); break; - case Film::VIDEO_FRAME_RATE: + case Film::Property::VIDEO_FRAME_RATE: { bool done = false; for (unsigned int i = 0; i < _frame_rate_choice->GetCount(); ++i) { @@ -493,7 +404,7 @@ DCPPanel::film_changed (int p) setup_dcp_name (); break; } - case Film::AUDIO_CHANNELS: + case Film::Property::AUDIO_CHANNELS: if (_film->audio_channels () < minimum_allowed_audio_channels ()) { _film->set_audio_channels (minimum_allowed_audio_channels ()); } else { @@ -501,39 +412,37 @@ DCPPanel::film_changed (int p) setup_dcp_name (); } break; - case Film::THREE_D: + case Film::Property::THREE_D: checked_set (_three_d, _film->three_d ()); setup_dcp_name (); break; - case Film::REENCODE_J2K: + case Film::Property::REENCODE_J2K: checked_set (_reencode_j2k, _film->reencode_j2k()); break; - case Film::INTEROP: + case Film::Property::INTEROP: checked_set (_standard, _film->interop() ? 1 : 0); setup_dcp_name (); _markers->Enable (!_film->interop()); break; - case Film::AUDIO_PROCESSOR: + case Film::Property::AUDIO_PROCESSOR: if (_film->audio_processor ()) { checked_set (_audio_processor, _film->audio_processor()->id()); } else { checked_set (_audio_processor, 0); } setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); - film_changed (Film::AUDIO_CHANNELS); + film_changed (Film::Property::AUDIO_CHANNELS); break; - case Film::REEL_TYPE: - checked_set (_reel_type, _film->reel_type ()); - _reel_length->Enable (_film->reel_type() == REELTYPE_BY_LENGTH); + case Film::Property::REEL_TYPE: + checked_set (_reel_type, static_cast(_film->reel_type())); + _reel_length->Enable (_film->reel_type() == ReelType::BY_LENGTH); break; - case Film::REEL_LENGTH: + case Film::Property::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: + case Film::Property::CONTENT: setup_dcp_name (); + setup_sensitivity (); break; default: break; @@ -544,9 +453,13 @@ void DCPPanel::film_content_changed (int property) { if (property == AudioContentProperty::STREAMS || + property == AudioContentProperty::LANGUAGE || property == TextContentProperty::USE || property == TextContentProperty::BURN || + property == TextContentProperty::LANGUAGE || + property == TextContentProperty::LANGUAGE_IS_ADDITIONAL || property == VideoContentProperty::SCALE || + property == VideoContentProperty::BURNT_SUBTITLE_LANGUAGE || property == DCPContentProperty::REFERENCE_VIDEO || property == DCPContentProperty::REFERENCE_AUDIO || property == DCPContentProperty::REFERENCE_TEXT) { @@ -615,15 +528,19 @@ DCPPanel::set_film (shared_ptr film) /* We are changing film, so destroy any dialogs for the old one */ if (_audio_dialog) { _audio_dialog->Destroy (); - _audio_dialog = 0; + _audio_dialog = nullptr; } if (_markers_dialog) { _markers_dialog->Destroy (); - _markers_dialog = 0; + _markers_dialog = nullptr; + } + if (_interop_metadata_dialog) { + _interop_metadata_dialog->Destroy (); + _interop_metadata_dialog = nullptr; } - if (_metadata_dialog) { - _metadata_dialog->Destroy (); - _metadata_dialog = 0; + if (_smpte_metadata_dialog) { + _smpte_metadata_dialog->Destroy (); + _smpte_metadata_dialog = nullptr; } _film = film; @@ -635,27 +552,24 @@ DCPPanel::set_film (shared_ptr film) 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); - film_changed (Film::AUDIO_CHANNELS); - film_changed (Film::SEQUENCE); - film_changed (Film::THREE_D); - film_changed (Film::INTEROP); - 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); + film_changed (Film::Property::NAME); + film_changed (Film::Property::USE_ISDCF_NAME); + film_changed (Film::Property::CONTENT); + film_changed (Film::Property::DCP_CONTENT_TYPE); + film_changed (Film::Property::CONTAINER); + film_changed (Film::Property::RESOLUTION); + film_changed (Film::Property::ENCRYPTED); + film_changed (Film::Property::J2K_BANDWIDTH); + film_changed (Film::Property::ISDCF_METADATA); + film_changed (Film::Property::VIDEO_FRAME_RATE); + film_changed (Film::Property::AUDIO_CHANNELS); + film_changed (Film::Property::SEQUENCE); + film_changed (Film::Property::THREE_D); + film_changed (Film::Property::INTEROP); + film_changed (Film::Property::AUDIO_PROCESSOR); + film_changed (Film::Property::REEL_TYPE); + film_changed (Film::Property::REEL_LENGTH); + film_changed (Film::Property::REENCODE_J2K); set_general_sensitivity(static_cast(_film)); } @@ -675,31 +589,35 @@ 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); + _reel_length->Enable (_generally_sensitive && _film && _film->reel_type() == ReelType::BY_LENGTH); _markers->Enable (_generally_sensitive && _film && !_film->interop()); _metadata->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()); + _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); } @@ -721,7 +639,7 @@ DCPPanel::edit_isdcf_button_clicked () return; } - ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata (), _film->three_d ()); + auto d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata (), _film->three_d ()); d->ShowModal (); _film->set_isdcf_metadata (d->isdcf_metadata ()); d->Destroy (); @@ -770,24 +688,11 @@ DCPPanel::config_changed (Config::Property p) _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000); setup_frame_rate_widget (); - if (p == Config::INTERFACE_COMPLEXITY) { - _grid->Clear (); - add_to_grid (); - _sizer->Layout (); - _grid->Layout (); - - _video_grid->Clear (); - add_video_panel_to_grid (); - _video_grid->Layout (); - - _audio_grid->Clear (); - add_audio_panel_to_grid (); - _audio_grid->Layout (); - } else if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) { + if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) { _audio_processor->Clear (); add_audio_processors (); if (_film) { - film_changed (Film::AUDIO_PROCESSOR); + film_changed (Film::Property::AUDIO_PROCESSOR); } } } @@ -802,15 +707,13 @@ DCPPanel::setup_frame_rate_widget () _frame_rate_choice->Show (); _frame_rate_spin->Hide (); } - - _frame_rate_sizer->Layout (); } wxPanel * DCPPanel::make_video_panel () { - wxPanel* panel = new wxPanel (_notebook); - wxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto panel = new wxPanel (_notebook); + auto sizer = new wxBoxSizer (wxVERTICAL); _video_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); sizer->Add (_video_grid, 0, wxALL, 8); panel->SetSizer (sizer); @@ -824,13 +727,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")); @@ -851,11 +750,11 @@ DCPPanel::make_video_panel () _three_d->Bind (wxEVT_CHECKBOX, boost::bind(&DCPPanel::three_d_changed, this)); _reencode_j2k->Bind (wxEVT_CHECKBOX, boost::bind(&DCPPanel::reencode_j2k_changed, this)); - BOOST_FOREACH (Ratio const * i, Ratio::containers()) { + for (auto i: Ratio::containers()) { _container->Append (std_to_wx(i->container_nickname())); } - BOOST_FOREACH (int i, Config::instance()->allowed_dcp_frame_rates()) { + for (auto i: Config::instance()->allowed_dcp_frame_rates()) { _frame_rate_choice->Append (std_to_wx (boost::lexical_cast (i))); } @@ -873,8 +772,6 @@ DCPPanel::make_video_panel () void DCPPanel::add_video_panel_to_grid () { - bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; - int r = 0; add_label_to_sizer (_video_grid, _container_label, true, wxGBPosition (r, 0)); @@ -895,7 +792,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; } @@ -903,19 +800,13 @@ DCPPanel::add_video_panel_to_grid () _video_grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - _j2k_bandwidth_label->Show (full); - _j2k_bandwidth->Show (full); - _mbits_label->Show (full); - - if (full) { - add_label_to_sizer (_video_grid, _j2k_bandwidth_label, true, wxGBPosition (r, 0)); - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_j2k_bandwidth, 1); - add_label_to_sizer (s, _mbits_label, false); - _video_grid->Add (s, wxGBPosition (r, 1)); - ++r; - _video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2)); - } + add_label_to_sizer (_video_grid, _j2k_bandwidth_label, true, wxGBPosition (r, 0)); + auto s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_j2k_bandwidth, 0, wxALIGN_CENTER_VERTICAL); + add_label_to_sizer (s, _mbits_label, false, 0, wxLEFT | wxALIGN_CENTER_VERTICAL); + _video_grid->Add (s, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND); + ++r; + _video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2)); } int @@ -936,7 +827,7 @@ DCPPanel::minimum_allowed_audio_channels () const wxPanel * DCPPanel::make_audio_panel () { - wxPanel* panel = new wxPanel (_notebook); + auto panel = new wxPanel (_notebook); _audio_panel_sizer = new wxBoxSizer (wxVERTICAL); _audio_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); _audio_panel_sizer->Add (_audio_grid, 0, wxALL, 8); @@ -964,27 +855,15 @@ DCPPanel::make_audio_panel () void DCPPanel::add_audio_panel_to_grid () { - bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; - int r = 0; - _channels_label->Show (full); - _audio_channels->Show (full); - - if (full) { - add_label_to_sizer (_audio_grid, _channels_label, true, wxGBPosition (r, 0)); - _audio_grid->Add (_audio_channels, wxGBPosition (r, 1)); - ++r; - } - - _processor_label->Show (full); - _audio_processor->Show (full); + add_label_to_sizer (_audio_grid, _channels_label, true, wxGBPosition (r, 0)); + _audio_grid->Add (_audio_channels, wxGBPosition (r, 1)); + ++r; - if (full) { - add_label_to_sizer (_audio_grid, _processor_label, true, wxGBPosition (r, 0)); - _audio_grid->Add (_audio_processor, wxGBPosition (r, 1)); - ++r; - } + add_label_to_sizer (_audio_grid, _processor_label, true, wxGBPosition (r, 0)); + _audio_grid->Add (_audio_processor, wxGBPosition (r, 1)); + ++r; _audio_grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -1004,7 +883,7 @@ DCPPanel::audio_processor_changed () return; } - string const s = string_client_data (_audio_processor->GetClientObject (_audio_processor->GetSelection ())); + auto const s = string_client_data (_audio_processor->GetClientObject (_audio_processor->GetSelection ())); _film->set_audio_processor (AudioProcessor::from_id (s)); } @@ -1020,7 +899,7 @@ DCPPanel::show_audio_clicked () _audio_dialog = 0; } - AudioDialog* d = new AudioDialog (_panel, _film); + auto d = new AudioDialog (_panel, _film, _viewer); d->Show (); } @@ -1048,7 +927,7 @@ void DCPPanel::add_audio_processors () { _audio_processor->Append (_("None"), new wxStringClientData (N_("none"))); - BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::visible()) { + for (auto ap: AudioProcessor::visible()) { _audio_processor->Append (std_to_wx(ap->name()), new wxStringClientData(std_to_wx(ap->id()))); } _audio_panel_sizer->Layout();