X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=6574bcdb314397c14f388397fc218857b9200671;hp=9d16b8c8fae764a67b27cda1d47210edcefce3b6;hb=4ec9f7096050e9d1107628ffc28b785fba3020a0;hpb=75538d19688ad8c29c5949de9bff9f044c713936 diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 9d16b8c8f..6574bcdb3 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,47 +18,61 @@ */ -#include "dcp_panel.h" -#include "wx_util.h" -#include "key_dialog.h" -#include "isdcf_metadata_dialog.h" + #include "audio_dialog.h" +#include "check_box.h" +#include "check_box.h" +#include "dcp_panel.h" +#include "dcpomatic_button.h" +#include "dcpomatic_choice.h" +#include "dcpomatic_spin_ctrl.h" #include "focus_manager.h" -#include "lib/ratio.h" +#include "interop_metadata_dialog.h" +#include "language_tag_dialog.h" +#include "markers_dialog.h" +#include "smpte_metadata_dialog.h" +#include "static_text.h" +#include "wx_util.h" +#include "lib/audio_content.h" +#include "lib/audio_processor.h" #include "lib/config.h" +#include "lib/dcp_content.h" #include "lib/dcp_content_type.h" -#include "lib/util.h" -#include "lib/film.h" #include "lib/ffmpeg_content.h" -#include "lib/audio_processor.h" -#include "lib/video_content.h" +#include "lib/film.h" +#include "lib/ratio.h" #include "lib/text_content.h" -#include "lib/dcp_content.h" -#include "lib/audio_content.h" +#include "lib/util.h" +#include "lib/video_content.h" #include -#include -#include -#include +#include +LIBDCP_DISABLE_WARNINGS #include +#include #include +#include +LIBDCP_ENABLE_WARNINGS #include -#include -#include -using std::cout; + using std::list; +using std::make_pair; +using std::max; +using std::pair; +using std::shared_ptr; using std::string; using std::vector; -using std::pair; -using std::max; -using std::make_pair; +using std::weak_ptr; using boost::lexical_cast; -using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; -DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) - : _audio_dialog (0) - , _film (film) + +DCPPanel::DCPPanel(wxNotebook* n, shared_ptr film, FilmViewer& viewer) + : _film (film) + , _viewer (viewer) , _generally_sensitive (true) { _panel = new wxPanel (n); @@ -72,43 +86,42 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) _name = new wxTextCtrl (_panel, wxID_ANY); FocusManager::instance()->add(_name); - _use_isdcf_name = new wxCheckBox (_panel, wxID_ANY, _("Use ISDCF name")); - _edit_isdcf_button = new wxButton (_panel, wxID_ANY, _("Details...")); - _copy_isdcf_name_button = new wxButton (_panel, wxID_ANY, _("Copy as name")); + _use_isdcf_name = new CheckBox (_panel, _("Use ISDCF name")); + _copy_isdcf_name_button = new Button (_panel, _("Copy as name")); /* wxST_ELLIPSIZE_MIDDLE works around a bug in GTK2 and/or wxWidgets, see http://trac.wxwidgets.org/ticket/12539 */ - _dcp_name = new wxStaticText ( - _panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, + _dcp_name = new StaticText ( + _panel, wxT (""), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE ); + _enable_audio_language = new CheckBox(_panel, _("Audio language")); + _audio_language = new wxStaticText (_panel, wxID_ANY, wxT("")); + _edit_audio_language = new Button (_panel, _("Edit...")); + _dcp_content_type_label = create_label (_panel, _("Content Type"), true); - _dcp_content_type = new wxChoice (_panel, wxID_ANY); + _dcp_content_type = new Choice(_panel); - _signed = new wxCheckBox (_panel, wxID_ANY, _("Signed")); - _encrypted = new wxCheckBox (_panel, wxID_ANY, _("Encrypted")); + _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 wxStaticText (_panel, wxID_ANY, "", wxDefaultPosition, size); - _edit_key = new wxButton (_panel, wxID_ANY, _("Edit...")); - _reels_label = create_label (_panel, _("Reels"), true); - _reel_type = new wxChoice (_panel, wxID_ANY); + _reel_type = new Choice(_panel); _reel_length_label = create_label (_panel, _("Reel length"), true); - _reel_length = new wxSpinCtrl (_panel, wxID_ANY); + _reel_length = new SpinCtrl (_panel, DCPOMATIC_SPIN_CTRL_WIDTH); _reel_length_gb_label = create_label (_panel, _("GB"), false); _standard_label = create_label (_panel, _("Standard"), true); - _standard = new wxChoice (_panel, wxID_ANY); + _standard = new Choice(_panel); - _upload_after_make_dcp = new wxCheckBox (_panel, wxID_ANY, _("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); @@ -116,47 +129,100 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) _notebook->AddPage (make_video_panel (), _("Video"), false); _notebook->AddPage (make_audio_panel (), _("Audio"), false); - _name->Bind (wxEVT_TEXT, boost::bind (&DCPPanel::name_changed, this)); - _use_isdcf_name->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::use_isdcf_name_toggled, this)); - _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)); - - BOOST_FOREACH (DCPContentType const * i, DCPContentType::all()) { - _dcp_content_type->Append (std_to_wx (i->pretty_name ())); - } - - _reel_type->Append (_("Single reel")); - _reel_type->Append (_("Split by video content")); + _name->Bind (wxEVT_TEXT, boost::bind(&DCPPanel::name_changed, this)); + _use_isdcf_name->bind(&DCPPanel::use_isdcf_name_toggled, 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)); + _encrypted->bind(&DCPPanel::encrypted_toggled, 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)); + _markers->Bind (wxEVT_BUTTON, boost::bind(&DCPPanel::markers_clicked, this)); + _metadata->Bind (wxEVT_BUTTON, boost::bind(&DCPPanel::metadata_clicked, this)); + _enable_audio_language->bind(&DCPPanel::enable_audio_language_toggled, this); + _edit_audio_language->Bind (wxEVT_BUTTON, boost::bind(&DCPPanel::edit_audio_language_clicked, this)); + + for (auto i: DCPContentType::all()) { + _dcp_content_type->add(i->pretty_name()); + } + + _reel_type->add(_("Single reel")); + _reel_type->add(_("Split by video content")); /// TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix - _reel_type->Append (S_("Reel|Custom")); + _reel_type->add(S_("Reel|Custom")); + _reel_type->SetToolTip(_("How the DCP should be split into parts internally. If in doubt, choose 'Single reel'")); _reel_length->SetRange (1, 64); - _standard->Append (_("SMPTE")); - _standard->Append (_("Interop")); + add_standards(); + _standard->SetToolTip(_("Which standard the DCP should use. Interop is older and SMPTE is the modern standard. If in doubt, choose 'SMPTE'")); - Config::instance()->Changed.connect (boost::bind (&DCPPanel::config_changed, this, _1)); + Config::instance()->Changed.connect (boost::bind(&DCPPanel::config_changed, this, _1)); add_to_grid (); } + void -DCPPanel::add_to_grid () +DCPPanel::add_standards() +{ + _standard->add(_("SMPTE"), N_("smpte")); + if (Config::instance()->allow_smpte_bv20() || (_film && _film->limit_to_smpte_bv20())) { + _standard->add(_("SMPTE (Bv2.0 only)"), N_("smpte-bv20")); + } + _standard->add(_("Interop"), N_("interop")); + _sizer->Layout(); +} + + +void +DCPPanel::set_standard() { - Config::Interface interface = Config::instance()->interface_complexity (); + DCPOMATIC_ASSERT(_film); + DCPOMATIC_ASSERT(!_film->limit_to_smpte_bv20() || _standard->GetCount() == 3); + + if (_film->interop()) { + checked_set(_standard, "interop"); + } else { + checked_set(_standard, _film->limit_to_smpte_bv20() ? "smpte-bv20" : "smpte"); + } +} + + +void +DCPPanel::standard_changed () +{ + if (!_film || !_standard->get()) { + return; + } + + auto const data = _standard->get_data(); + if (!data) { + return; + } + if (*data == N_("interop")) { + _film->set_interop(true); + _film->set_limit_to_smpte_bv20(false); + } else if (*data == N_("smpte")) { + _film->set_interop(false); + _film->set_limit_to_smpte_bv20(false); + } else if (*data == N_("smpte-bv20")) { + _film->set_interop(false); + _film->set_limit_to_smpte_bv20(true); + } +} + + +void +DCPPanel::add_to_grid () +{ 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, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + _grid->Add (name_sizer, wxGBPosition(r, 0), wxGBSpan(1, 2), wxRIGHT | wxEXPAND, DCPOMATIC_DIALOG_BORDER); ++r; int flags = wxALIGN_CENTER_VERTICAL; @@ -164,90 +230,57 @@ DCPPanel::add_to_grid () flags |= wxALIGN_RIGHT; #endif - _use_isdcf_name->Show (interface == Config::INTERFACE_FULL); - _edit_isdcf_button->Show (interface == Config::INTERFACE_FULL); - _copy_isdcf_name_button->Show (interface == Config::INTERFACE_FULL); - - if (interface == Config::INTERFACE_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); + { + auto s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_copy_isdcf_name_button, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP); + _grid->Add (s, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD); } - - _grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND); ++r; - add_label_to_sizer (_grid, _dcp_content_type_label, true, wxGBPosition (r, 0)); - _grid->Add (_dcp_content_type, wxGBPosition (r, 1)); + _grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND); ++r; - _signed->Show (interface == Config::INTERFACE_FULL); - if (interface == Config::INTERFACE_FULL) { - _grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2)); - ++r; + { + auto s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_enable_audio_language, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP); + s->Add (_audio_language, 1, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD); + s->Add (_edit_audio_language, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD); + _grid->Add (s, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL); } + ++r; - _grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2)); + add_label_to_sizer (_grid, _dcp_content_type_label, true, wxGBPosition(r, 0)); + _grid->Add (_dcp_content_type, wxGBPosition(r, 1)); ++r; - _key_label->Show (interface == Config::INTERFACE_FULL); - _key->Show (interface == Config::INTERFACE_FULL); - _edit_key->Show (interface == Config::INTERFACE_FULL); - _reels_label->Show (interface == Config::INTERFACE_FULL); - _reel_type->Show (interface == Config::INTERFACE_FULL); - _reel_length_label->Show (interface == Config::INTERFACE_FULL); - _reel_length->Show (interface == Config::INTERFACE_FULL); - _reel_length_gb_label->Show (interface == Config::INTERFACE_FULL); - _standard_label->Show (interface == Config::INTERFACE_FULL); - _standard->Show (interface == Config::INTERFACE_FULL); - _upload_after_make_dcp->Show (interface == Config::INTERFACE_FULL); - - if (interface == Config::INTERFACE_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; + _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; + 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)); + { + auto 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; - 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; - _grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2)); - ++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 -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 () @@ -256,9 +289,10 @@ DCPPanel::name_changed () return; } - _film->set_name (string (_name->GetValue().mb_str())); + _film->set_name (string(_name->GetValue().mb_str())); } + void DCPPanel::j2k_bandwidth_changed () { @@ -269,15 +303,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 () @@ -286,24 +311,27 @@ DCPPanel::encrypted_toggled () return; } - _film->set_encrypted (_encrypted->GetValue ()); + _film->set_encrypted (_encrypted->GetValue()); } + /** Called when the frame rate choice widget has been changed */ void DCPPanel::frame_rate_choice_changed () { - if (!_film) { + if (!_film || !_frame_rate_choice->get()) { return; } _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->get())) + ), + true ); } + /** Called when the frame rate spin widget has been changed */ void DCPPanel::frame_rate_spin_changed () @@ -312,9 +340,10 @@ DCPPanel::frame_rate_spin_changed () return; } - _film->set_video_frame_rate (_frame_rate_spin->GetValue ()); + _film->set_video_frame_rate (_frame_rate_spin->GetValue()); } + void DCPPanel::audio_channels_changed () { @@ -322,98 +351,97 @@ DCPPanel::audio_channels_changed () return; } - _film->set_audio_channels (locale_convert (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ())))); + _film->set_audio_channels(locale_convert(string_client_data(_audio_channels->GetClientObject(*_audio_channels->get())))); } + void DCPPanel::resolution_changed () { - if (!_film) { + if (!_film || !_resolution->get()) { return; } - _film->set_resolution (_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K); + _film->set_resolution(*_resolution->get() == 0 ? Resolution::TWO_K : Resolution::FOUR_K); } + void -DCPPanel::standard_changed () +DCPPanel::markers_clicked () { - if (!_film) { - return; - } - - _film->set_interop (_standard->GetSelection() == 1); + _markers_dialog.reset(_panel, _film, _viewer); + _markers_dialog->Show(); } + void -DCPPanel::upload_after_make_dcp_changed () +DCPPanel::metadata_clicked () { - if (!_film) { - return; + if (_film->interop()) { + _interop_metadata_dialog.reset(_panel, _film); + _interop_metadata_dialog->setup (); + _interop_metadata_dialog->Show (); + } else { + _smpte_metadata_dialog.reset(_panel, _film); + _smpte_metadata_dialog->setup (); + _smpte_metadata_dialog->Show (); } - - _film->set_upload_after_make_dcp (_upload_after_make_dcp->GetValue ()); } + 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: - checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ())); + case Film::Property::DCP_CONTENT_TYPE: + { + auto index = DCPContentType::as_index(_film->dcp_content_type()); + DCPOMATIC_ASSERT (index); + checked_set (_dcp_content_type, *index); 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 ()); + 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; } - case Film::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) { - if (wx_to_std (_frame_rate_choice->GetString(i)) == boost::lexical_cast (_film->video_frame_rate())) { + if (wx_to_std(_frame_rate_choice->GetString(i)) == boost::lexical_cast(_film->video_frame_rate())) { checked_set (_frame_rate_choice, i); done = true; break; @@ -430,45 +458,75 @@ DCPPanel::film_changed (int p) setup_dcp_name (); break; } - case Film::AUDIO_CHANNELS: - if (_film->audio_channels () < minimum_allowed_audio_channels ()) { - _film->set_audio_channels (minimum_allowed_audio_channels ()); + case Film::Property::AUDIO_CHANNELS: + if (_film->audio_channels() < minimum_allowed_audio_channels()) { + _film->set_audio_channels (minimum_allowed_audio_channels()); } else { - checked_set (_audio_channels, locale_convert (max (minimum_allowed_audio_channels(), _film->audio_channels ()))); + checked_set (_audio_channels, locale_convert(max(minimum_allowed_audio_channels(), _film->audio_channels()))); setup_dcp_name (); } break; - case Film::THREE_D: - checked_set (_three_d, _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: - checked_set (_standard, _film->interop() ? 1 : 0); + case Film::Property::INTEROP: + set_standard(); setup_dcp_name (); + _markers->Enable (!_film->interop()); + break; + case Film::Property::LIMIT_TO_SMPTE_BV20: + set_standard(); break; - case Film::AUDIO_PROCESSOR: - if (_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); + setup_audio_channels_choice (_audio_channels, minimum_allowed_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 ()); + case Film::Property::CONTENT: + setup_dcp_name (); + setup_sensitivity (); break; - case Film::CONTENT: + case Film::Property::AUDIO_LANGUAGE: + { + auto al = _film->audio_language(); + checked_set (_enable_audio_language, static_cast(al)); + checked_set (_audio_language, al ? std_to_wx(al->to_string()) : wxT("")); + setup_dcp_name (); + setup_sensitivity (); + break; + } + case Film::Property::AUDIO_FRAME_RATE: + if (_audio_sample_rate) { + checked_set (_audio_sample_rate, _film->audio_frame_rate() == 48000 ? 0 : 1); + } + break; + case Film::Property::CONTENT_VERSIONS: + case Film::Property::VERSION_NUMBER: + case Film::Property::RELEASE_TERRITORY: + case Film::Property::RATINGS: + case Film::Property::FACILITY: + case Film::Property::STUDIO: + case Film::Property::TEMP_VERSION: + case Film::Property::PRE_RELEASE: + case Film::Property::RED_BAND: + case Film::Property::TWO_D_VERSION_OF_THREE_D: + case Film::Property::CHAIN: + case Film::Property::LUMINANCE: setup_dcp_name (); break; default: @@ -476,13 +534,19 @@ DCPPanel::film_changed (int p) } } + void DCPPanel::film_content_changed (int property) { if (property == AudioContentProperty::STREAMS || property == TextContentProperty::USE || property == TextContentProperty::BURN || - property == VideoContentProperty::SCALE || + property == TextContentProperty::LANGUAGE || + property == TextContentProperty::LANGUAGE_IS_ADDITIONAL || + property == VideoContentProperty::CUSTOM_RATIO || + property == VideoContentProperty::CUSTOM_SIZE || + property == VideoContentProperty::BURNT_SUBTITLE_LANGUAGE || + property == VideoContentProperty::CROP || property == DCPContentProperty::REFERENCE_VIDEO || property == DCPContentProperty::REFERENCE_AUDIO || property == DCPContentProperty::REFERENCE_TEXT) { @@ -496,25 +560,26 @@ void DCPPanel::setup_container () { int n = 0; - vector ratios = Ratio::containers (); - vector::iterator i = ratios.begin (); - while (i != ratios.end() && *i != _film->container ()) { + auto ratios = Ratio::containers (); + auto i = ratios.begin (); + while (i != ratios.end() && *i != _film->container()) { ++i; ++n; } if (i == ratios.end()) { checked_set (_container, -1); - checked_set (_container_size, wxT ("")); + checked_set (_container_size, wxT("")); } else { checked_set (_container, n); - dcp::Size const size = fit_ratio_within (_film->container()->ratio(), _film->full_frame ()); - checked_set (_container_size, wxString::Format ("%dx%d", size.width, size.height)); + auto const size = fit_ratio_within (_film->container()->ratio(), _film->full_frame ()); + checked_set (_container_size, wxString::Format("%dx%d", size.width, size.height)); } setup_dcp_name (); } + /** Called when the container widget has been changed */ void DCPPanel::container_changed () @@ -523,14 +588,15 @@ DCPPanel::container_changed () return; } - int const n = _container->GetSelection (); - if (n >= 0) { - vector ratios = Ratio::containers (); - DCPOMATIC_ASSERT (n < int (ratios.size())); - _film->set_container (ratios[n]); + auto const n = _container->get(); + if (n) { + auto ratios = Ratio::containers (); + DCPOMATIC_ASSERT(*n < int(ratios.size())); + _film->set_container(ratios[*n]); } } + /** Called when the DCP content type widget has been changed */ void DCPPanel::dcp_content_type_changed () @@ -539,48 +605,59 @@ DCPPanel::dcp_content_type_changed () return; } - int const n = _dcp_content_type->GetSelection (); - if (n != wxNOT_FOUND) { - _film->set_dcp_content_type (DCPContentType::from_index (n)); + auto n = _dcp_content_type->get(); + if (n) { + _film->set_dcp_content_type(DCPContentType::from_index(*n)); } } + void DCPPanel::set_film (shared_ptr film) { - /* We are changing film, so destroy any audio dialog for the old one */ - if (_audio_dialog) { - _audio_dialog->Destroy (); - _audio_dialog = 0; - } + /* We are changing film, so destroy any dialogs for the old one */ + _audio_dialog.reset(); + _markers_dialog.reset(); + _interop_metadata_dialog.reset(); + _smpte_metadata_dialog.reset(); _film = film; - 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); + if (!_film) { + /* Really should all the film_changed below but this might be enough */ + checked_set (_dcp_name, wxT("")); + set_general_sensitivity (false); + return; + } + + _standard->Clear(); + add_standards(); + + 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::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); + film_changed (Film::Property::AUDIO_LANGUAGE); + film_changed (Film::Property::AUDIO_FRAME_RATE); + film_changed (Film::Property::LIMIT_TO_SMPTE_BV20); set_general_sensitivity(static_cast(_film)); } + void DCPPanel::set_general_sensitivity (bool s) { @@ -588,69 +665,69 @@ DCPPanel::set_general_sensitivity (bool s) setup_sensitivity (); } + void DCPPanel::setup_sensitivity () { _name->Enable (_generally_sensitive); _use_isdcf_name->Enable (_generally_sensitive); - _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); - + _enable_audio_language->Enable (_generally_sensitive); + _audio_language->Enable (_enable_audio_language->GetValue()); + _edit_audio_language->Enable (_enable_audio_language->GetValue()); _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()); + _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() && !_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()); -} -void -DCPPanel::use_isdcf_name_toggled () -{ - if (!_film) { - return; - } + _standard->Enable ( + _generally_sensitive && + _film && + !_film->references_dcp_video() && + !_film->references_dcp_audio() && + !_film->contains_atmos_content() + ); - _film->set_use_isdcf_name (_use_isdcf_name->GetValue ()); + _reencode_j2k->Enable (_generally_sensitive && _film); + _show_audio->Enable (_generally_sensitive && _film); } + void -DCPPanel::edit_isdcf_button_clicked () +DCPPanel::use_isdcf_name_toggled () { if (!_film) { return; } - ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata (), _film->three_d ()); - d->ShowModal (); - _film->set_isdcf_metadata (d->isdcf_metadata ()); - d->Destroy (); + _film->set_use_isdcf_name (_use_isdcf_name->GetValue()); } void DCPPanel::setup_dcp_name () { - _dcp_name->SetLabel (std_to_wx (_film->dcp_name (true))); - _dcp_name->SetToolTip (std_to_wx (_film->dcp_name (true))); + _dcp_name->SetLabel (std_to_wx(_film->dcp_name(true))); + _dcp_name->SetToolTip (std_to_wx(_film->dcp_name(true))); } + void DCPPanel::best_frame_rate_clicked () { @@ -658,9 +735,10 @@ DCPPanel::best_frame_rate_clicked () return; } - _film->set_video_frame_rate (_film->best_video_frame_rate ()); + _film->set_video_frame_rate (_film->best_video_frame_rate()); } + void DCPPanel::three_d_changed () { @@ -668,9 +746,10 @@ DCPPanel::three_d_changed () return; } - _film->set_three_d (_three_d->GetValue ()); + _film->set_three_d (_three_d->GetValue()); } + void DCPPanel::reencode_j2k_changed () { @@ -681,75 +760,72 @@ DCPPanel::reencode_j2k_changed () _film->set_reencode_j2k (_reencode_j2k->GetValue()); } + void 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 (); + if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) { + _audio_processor->Clear (); + add_audio_processors (); + if (_film) { + film_changed (Film::Property::AUDIO_PROCESSOR); + } + } else if (p == Config::ALLOW_SMPTE_BV20) { + _standard->Clear(); + add_standards(); + if (_film) { + film_changed(Film::Property::INTEROP); + film_changed(Film::Property::LIMIT_TO_SMPTE_BV20); + } } } + void DCPPanel::setup_frame_rate_widget () { - if (Config::instance()->allow_any_dcp_frame_rate ()) { + if (Config::instance()->allow_any_dcp_frame_rate()) { _frame_rate_choice->Hide (); _frame_rate_spin->Show (); } else { _frame_rate_choice->Show (); _frame_rate_spin->Hide (); } - - _frame_rate_sizer->Layout (); + _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); _container_label = create_label (panel, _("Container"), true); - _container = new wxChoice (panel, wxID_ANY); - _container_size = new wxStaticText (panel, wxID_ANY, wxT ("")); + _container = new Choice(panel); + _container_size = new StaticText (panel, wxT ("")); _resolution_label = create_label (panel, _("Resolution"), true); - _resolution = new wxChoice (panel, wxID_ANY); + _resolution = new Choice(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 wxButton (panel, wxID_ANY, _("Use best")); - _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL); + _frame_rate_choice = new Choice(panel); + _frame_rate_spin = new SpinCtrl (panel, DCPOMATIC_SPIN_CTRL_WIDTH); + _best_frame_rate = new Button (panel, _("Use best")); - _three_d = new wxCheckBox (panel, wxID_ANY, _("3D")); + _three_d = new CheckBox (panel, _("3D")); _j2k_bandwidth_label = create_label (panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true); - _j2k_bandwidth = new wxSpinCtrl (panel, wxID_ANY); + _j2k_bandwidth = new SpinCtrl (panel, DCPOMATIC_SPIN_CTRL_WIDTH); _mbits_label = create_label (panel, _("Mbit/s"), false); - _reencode_j2k = new wxCheckBox (panel, wxID_ANY, _("Re-encode JPEG2000 data from input")); + _reencode_j2k = new CheckBox (panel, _("Re-encode JPEG2000 data from input")); _container->Bind (wxEVT_CHOICE, boost::bind(&DCPPanel::container_changed, this)); _frame_rate_choice->Bind (wxEVT_CHOICE, boost::bind(&DCPPanel::frame_rate_choice_changed, this)); @@ -759,38 +835,38 @@ DCPPanel::make_video_panel () /* Also listen to wxEVT_TEXT so that typing numbers directly in is always noticed */ _j2k_bandwidth->Bind (wxEVT_TEXT, boost::bind(&DCPPanel::j2k_bandwidth_changed, this)); _resolution->Bind (wxEVT_CHOICE, boost::bind(&DCPPanel::resolution_changed, this)); - _three_d->Bind (wxEVT_CHECKBOX, boost::bind(&DCPPanel::three_d_changed, this)); - _reencode_j2k->Bind (wxEVT_CHECKBOX, boost::bind(&DCPPanel::reencode_j2k_changed, this)); + _three_d->bind(&DCPPanel::three_d_changed, this); + _reencode_j2k->bind(&DCPPanel::reencode_j2k_changed, this); - BOOST_FOREACH (Ratio const * i, Ratio::containers()) { - _container->Append (std_to_wx(i->container_nickname())); + for (auto i: Ratio::containers()) { + _container->add(i->container_nickname()); } - BOOST_FOREACH (int i, Config::instance()->allowed_dcp_frame_rates()) { - _frame_rate_choice->Append (std_to_wx (boost::lexical_cast (i))); + for (auto i: Config::instance()->allowed_dcp_frame_rates()) { + _frame_rate_choice->add(boost::lexical_cast(i)); } _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000); _frame_rate_spin->SetRange (1, 480); - _resolution->Append (_("2K")); - _resolution->Append (_("4K")); + _resolution->add(_("2K")); + _resolution->add(_("4K")); add_video_panel_to_grid (); + setup_frame_rate_widget(); return 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)); { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + auto s = new wxBoxSizer (wxHORIZONTAL); s->Add (_container, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP); s->Add (_container_size, 1, wxLEFT | wxALIGN_CENTER_VERTICAL); _video_grid->Add (s, wxGBPosition(r, 1)); @@ -806,7 +882,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; } @@ -814,21 +890,16 @@ 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); + ++r; + _video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2)); } + int DCPPanel::minimum_allowed_audio_channels () const { @@ -844,66 +915,73 @@ DCPPanel::minimum_allowed_audio_channels () const return min; } + wxPanel * DCPPanel::make_audio_panel () { - wxPanel* panel = new wxPanel (_notebook); - wxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto panel = new wxPanel (_notebook); + _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); + _audio_channels = new Choice(panel); setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); - _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 ()))); + if (Config::instance()->allow_96khz_audio()) { + _audio_sample_rate_label = create_label (panel, _("Sample rate"), true); + _audio_sample_rate = new wxChoice (panel, wxID_ANY); } - _show_audio = new wxButton (panel, wxID_ANY, _("Show audio...")); + _processor_label = create_label (panel, _("Processor"), true); + _audio_processor = new Choice(panel); + add_audio_processors (); + + _show_audio = new Button (panel, _("Show graph of audio levels...")); _audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_channels_changed, this)); + if (_audio_sample_rate) { + _audio_sample_rate->Bind (wxEVT_CHOICE, boost::bind(&DCPPanel::audio_sample_rate_changed, this)); + } _audio_processor->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_processor_changed, this)); _show_audio->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::show_audio_clicked, this)); + if (_audio_sample_rate) { + _audio_sample_rate->Append (_("48kHz")); + _audio_sample_rate->Append (_("96kHz")); + } + add_audio_panel_to_grid (); return 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); + 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, _channels_label, true, wxGBPosition (r, 0)); - _audio_grid->Add (_audio_channels, wxGBPosition (r, 1)); + if (_audio_sample_rate_label && _audio_sample_rate) { + add_label_to_sizer (_audio_grid, _audio_sample_rate_label, true, wxGBPosition(r, 0)); + _audio_grid->Add (_audio_sample_rate, wxGBPosition(r, 1)); ++r; } - _processor_label->Show (full); - _audio_processor->Show (full); - - 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; } + void DCPPanel::copy_isdcf_name_button_clicked () { @@ -911,17 +989,19 @@ DCPPanel::copy_isdcf_name_button_clicked () _film->set_use_isdcf_name (false); } + void DCPPanel::audio_processor_changed () { - if (!_film) { + if (!_film || !_audio_processor->get()) { return; } - string const s = string_client_data (_audio_processor->GetClientObject (_audio_processor->GetSelection ())); + auto const s = string_client_data(_audio_processor->GetClientObject(*_audio_processor->get())); _film->set_audio_processor (AudioProcessor::from_id (s)); } + void DCPPanel::show_audio_clicked () { @@ -929,25 +1009,22 @@ DCPPanel::show_audio_clicked () return; } - if (_audio_dialog) { - _audio_dialog->Destroy (); - _audio_dialog = 0; - } - - AudioDialog* d = new AudioDialog (_panel, _film); - d->Show (); + _audio_dialog.reset(_panel, _film, _viewer); + _audio_dialog->Show(); } + void DCPPanel::reel_type_changed () { - if (!_film) { + if (!_film || !_reel_type->get()) { return; } - _film->set_reel_type (static_cast (_reel_type->GetSelection ())); + _film->set_reel_type(static_cast(*_reel_type->get())); } + void DCPPanel::reel_length_changed () { @@ -957,3 +1034,48 @@ DCPPanel::reel_length_changed () _film->set_reel_length (_reel_length->GetValue() * 1000000000LL); } + + +void +DCPPanel::add_audio_processors () +{ + _audio_processor->add(_("None"), new wxStringClientData(N_("none"))); + for (auto ap: AudioProcessor::visible()) { + _audio_processor->add(std_to_wx(ap->name()), new wxStringClientData(std_to_wx(ap->id()))); + } + _audio_panel_sizer->Layout(); +} + + +void +DCPPanel::enable_audio_language_toggled () +{ + setup_sensitivity (); + if (_enable_audio_language->GetValue()) { + auto al = wx_to_std (_audio_language->GetLabel()); + _film->set_audio_language (al.empty() ? dcp::LanguageTag("en-US") : dcp::LanguageTag(al)); + } else { + _film->set_audio_language (boost::none); + } +} + + +void +DCPPanel::edit_audio_language_clicked () +{ + DCPOMATIC_ASSERT (_film->audio_language()); + auto d = make_wx(_panel, *_film->audio_language()); + if (d->ShowModal() == wxID_OK) { + _film->set_audio_language(d->get()); + } +} + + +void +DCPPanel::audio_sample_rate_changed () +{ + if (_audio_sample_rate) { + _film->set_audio_frame_rate (_audio_sample_rate->GetSelection() == 0 ? 48000 : 96000); + } +} +