X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fdcp_panel.cc;h=5d941301bcb75865b8c2b545aa5bd46d20d22d4c;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=d53badaa5a54dd4a3f91f6a0141ddb73e4abacd6;hpb=dc780a1ff5b1e202de94670f070d9c4385c72f85;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index d53badaa5..5d941301b 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -28,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" @@ -46,7 +47,6 @@ #include #include #include -#include #include using std::cout; @@ -57,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) @@ -132,7 +136,7 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v _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 ())); } @@ -154,8 +158,6 @@ 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)); @@ -167,22 +169,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; @@ -194,43 +188,28 @@ DCPPanel::add_to_grid () _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; - _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); - _markers->Show (full); - _metadata->Show (full); - _reencode_j2k->Show (full); - _encrypted->Show (full); - - if (full) { - 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, _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; + add_label_to_sizer (_grid, _standard_label, true, wxGBPosition (r, 0)); + _grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + ++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; - } + 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 @@ -335,13 +314,23 @@ 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; + } - _metadata_dialog = new MetadataDialog (_panel, _film); - _metadata_dialog->Show (); + _interop_metadata_dialog = new InteropMetadataDialog (_panel, _film); + _interop_metadata_dialog->Show (); + } else { + if (_smpte_metadata_dialog) { + _smpte_metadata_dialog->Destroy (); + _smpte_metadata_dialog = 0; + } + + _smpte_metadata_dialog = new SMPTEMetadataDialog (_panel, _film); + _smpte_metadata_dialog->Show (); + } } void @@ -390,6 +379,7 @@ DCPPanel::film_changed (int p) break; } case Film::ISDCF_METADATA: + case Film::SUBTITLE_LANGUAGES: setup_dcp_name (); break; case Film::VIDEO_FRAME_RATE: @@ -451,6 +441,7 @@ DCPPanel::film_changed (int p) break; case Film::CONTENT: setup_dcp_name (); + setup_sensitivity (); break; default: break; @@ -538,9 +529,13 @@ DCPPanel::set_film (shared_ptr film) _markers_dialog->Destroy (); _markers_dialog = 0; } - if (_metadata_dialog) { - _metadata_dialog->Destroy (); - _metadata_dialog = 0; + if (_interop_metadata_dialog) { + _interop_metadata_dialog->Destroy (); + _interop_metadata_dialog = 0; + } + if (_smpte_metadata_dialog) { + _smpte_metadata_dialog->Destroy (); + _smpte_metadata_dialog = 0; } _film = film; @@ -594,16 +589,30 @@ DCPPanel::setup_sensitivity () _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); } @@ -674,20 +683,7 @@ 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) { @@ -749,11 +745,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))); } @@ -771,8 +767,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)); @@ -793,7 +787,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; } @@ -801,19 +795,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)); + wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_j2k_bandwidth, 0, wxALIGN_CENTER_VERTICAL); + add_label_to_sizer (s, _mbits_label, false, 0, 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 @@ -862,27 +850,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; @@ -946,7 +922,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();