X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=6574bcdb314397c14f388397fc218857b9200671;hp=3a4644b422d2a14538d4e22c77a2e1614683fb1d;hb=4ec9f7096050e9d1107628ffc28b785fba3020a0;hpb=55c007ab910ee9586d6bd2faba165e42f6148622 diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 3a4644b42..6574bcdb3 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -18,58 +18,60 @@ */ + #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 "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/ratio.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 +LIBDCP_DISABLE_WARNINGS #include +#include #include +#include +LIBDCP_ENABLE_WARNINGS #include -#include -using std::cout; + using std::list; -using std::string; -using std::vector; -using std::pair; -using std::max; using std::make_pair; -using boost::lexical_cast; +using std::max; +using std::pair; using std::shared_ptr; +using std::string; +using std::vector; using std::weak_ptr; +using boost::lexical_cast; #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) - , _interop_metadata_dialog (0) - , _smpte_metadata_dialog (0) - , _film (film) + +DCPPanel::DCPPanel(wxNotebook* n, shared_ptr film, FilmViewer& viewer) + : _film (film) , _viewer (viewer) , _generally_sensitive (true) { @@ -95,8 +97,12 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v 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); _encrypted = new CheckBox (_panel, _("Encrypted")); @@ -105,14 +111,14 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v size.SetHeight (-1); _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); _markers = new Button (_panel, _("Markers...")); _metadata = new Button (_panel, _("Metadata...")); @@ -123,36 +129,91 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v _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)); - _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 (wxEVT_CHECKBOX, boost::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)); + _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->Append (std_to_wx (i->pretty_name ())); + _dcp_content_type->add(i->pretty_name()); } - _reel_type->Append (_("Single reel")); - _reel_type->Append (_("Split by video content")); + _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_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() +{ + 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 () { @@ -169,39 +230,48 @@ DCPPanel::add_to_grid () flags |= wxALIGN_RIGHT; #endif - _grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags); + _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); + _grid->Add (s, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD); } ++r; _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)); + { + 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; + + add_label_to_sizer (_grid, _dcp_content_type_label, true, wxGBPosition(r, 0)); + _grid->Add (_dcp_content_type, wxGBPosition(r, 1)); ++r; - _grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2)); + _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); + 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)); + add_label_to_sizer (_grid, _reel_length_label, true, wxGBPosition(r, 0)); { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + 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)); + _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); + 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); @@ -211,6 +281,7 @@ DCPPanel::add_to_grid () ++r; } + void DCPPanel::name_changed () { @@ -218,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 () { @@ -231,6 +303,7 @@ DCPPanel::j2k_bandwidth_changed () _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000); } + void DCPPanel::encrypted_toggled () { @@ -238,25 +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())) + 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 () @@ -265,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 () { @@ -275,65 +351,44 @@ 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::TWO_K : Resolution::FOUR_K); + _film->set_resolution(*_resolution->get() == 0 ? Resolution::TWO_K : Resolution::FOUR_K); } -void -DCPPanel::standard_changed () -{ - if (!_film) { - return; - } - - _film->set_interop (_standard->GetSelection() == 1); -} void DCPPanel::markers_clicked () { - if (_markers_dialog) { - _markers_dialog->Destroy (); - _markers_dialog = 0; - } - - _markers_dialog = new MarkersDialog (_panel, _film, _viewer); + _markers_dialog.reset(_panel, _film, _viewer); _markers_dialog->Show(); } + void DCPPanel::metadata_clicked () { 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.reset(_panel, _film); _interop_metadata_dialog->setup (); _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.reset(_panel, _film); _smpte_metadata_dialog->setup (); _smpte_metadata_dialog->Show (); } } + void DCPPanel::film_changed (Film::Property p) { @@ -348,9 +403,13 @@ DCPPanel::film_changed (Film::Property p) setup_dcp_name (); break; case Film::Property::DCP_CONTENT_TYPE: - checked_set (_dcp_content_type, DCPContentType::as_index (_film->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::Property::ENCRYPTED: checked_set (_encrypted, _film->encrypted ()); break; @@ -364,7 +423,7 @@ DCPPanel::film_changed (Film::Property p) break; 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). @@ -382,7 +441,7 @@ DCPPanel::film_changed (Film::Property p) { 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; @@ -400,32 +459,35 @@ DCPPanel::film_changed (Film::Property p) break; } case Film::Property::AUDIO_CHANNELS: - if (_film->audio_channels () < minimum_allowed_audio_channels ()) { - _film->set_audio_channels (minimum_allowed_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::Property::THREE_D: - checked_set (_three_d, _film->three_d ()); + checked_set (_three_d, _film->three_d()); setup_dcp_name (); break; case Film::Property::REENCODE_J2K: checked_set (_reencode_j2k, _film->reencode_j2k()); break; case Film::Property::INTEROP: - checked_set (_standard, _film->interop() ? 1 : 0); + set_standard(); setup_dcp_name (); _markers->Enable (!_film->interop()); break; + case Film::Property::LIMIT_TO_SMPTE_BV20: + set_standard(); + break; case Film::Property::AUDIO_PROCESSOR: - if (_film->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 ()); + setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels()); film_changed (Film::Property::AUDIO_CHANNELS); break; case Film::Property::REEL_TYPE: @@ -439,6 +501,20 @@ DCPPanel::film_changed (Film::Property p) setup_dcp_name (); setup_sensitivity (); break; + 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: @@ -458,17 +534,19 @@ DCPPanel::film_changed (Film::Property p) } } + 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::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) { @@ -482,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 () @@ -509,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 () @@ -525,32 +605,21 @@ 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 dialogs for the old one */ - if (_audio_dialog) { - _audio_dialog->Destroy (); - _audio_dialog = nullptr; - } - if (_markers_dialog) { - _markers_dialog->Destroy (); - _markers_dialog = nullptr; - } - if (_interop_metadata_dialog) { - _interop_metadata_dialog->Destroy (); - _interop_metadata_dialog = nullptr; - } - if (_smpte_metadata_dialog) { - _smpte_metadata_dialog->Destroy (); - _smpte_metadata_dialog = nullptr; - } + _audio_dialog.reset(); + _markers_dialog.reset(); + _interop_metadata_dialog.reset(); + _smpte_metadata_dialog.reset(); _film = film; @@ -561,6 +630,9 @@ DCPPanel::set_film (shared_ptr film) return; } + _standard->Clear(); + add_standards(); + film_changed (Film::Property::NAME); film_changed (Film::Property::USE_ISDCF_NAME); film_changed (Film::Property::CONTENT); @@ -578,10 +650,14 @@ DCPPanel::set_film (shared_ptr film) 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) { @@ -589,6 +665,7 @@ DCPPanel::set_general_sensitivity (bool s) setup_sensitivity (); } + void DCPPanel::setup_sensitivity () { @@ -596,6 +673,9 @@ DCPPanel::setup_sensitivity () _use_isdcf_name->Enable (_generally_sensitive); _dcp_content_type->Enable (_generally_sensitive); _copy_isdcf_name_button->Enable (_generally_sensitive); + _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); _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); @@ -629,6 +709,7 @@ DCPPanel::setup_sensitivity () _show_audio->Enable (_generally_sensitive && _film); } + void DCPPanel::use_isdcf_name_toggled () { @@ -636,16 +717,17 @@ DCPPanel::use_isdcf_name_toggled () return; } - _film->set_use_isdcf_name (_use_isdcf_name->GetValue ()); + _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 () { @@ -653,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 () { @@ -663,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 () { @@ -676,6 +760,7 @@ DCPPanel::reencode_j2k_changed () _film->set_reencode_j2k (_reencode_j2k->GetValue()); } + void DCPPanel::config_changed (Config::Property p) { @@ -688,21 +773,31 @@ DCPPanel::config_changed (Config::Property p) 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(); } + wxPanel * DCPPanel::make_video_panel () { @@ -713,27 +808,21 @@ DCPPanel::make_video_panel () panel->SetSizer (sizer); _container_label = create_label (panel, _("Container"), true); - _container = new wxChoice (panel, wxID_ANY); + _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_spin = new wxSpinCtrl (panel, wxID_ANY); - setup_frame_rate_widget (); + _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 CheckBox (panel, _("3D")); _j2k_bandwidth_label = create_label (panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true); -#ifdef __WXGTK3__ - int const spin_width = 118; -#else - int const spin_width = 56; -#endif - _j2k_bandwidth = new SpinCtrl (panel, spin_width); + _j2k_bandwidth = new SpinCtrl (panel, DCPOMATIC_SPIN_CTRL_WIDTH); _mbits_label = create_label (panel, _("Mbit/s"), false); _reencode_j2k = new CheckBox (panel, _("Re-encode JPEG2000 data from input")); @@ -746,28 +835,30 @@ 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); for (auto i: Ratio::containers()) { - _container->Append (std_to_wx(i->container_nickname())); + _container->add(i->container_nickname()); } for (auto i: Config::instance()->allowed_dcp_frame_rates()) { - _frame_rate_choice->Append (std_to_wx (boost::lexical_cast (i))); + _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 () { @@ -775,7 +866,7 @@ DCPPanel::add_video_panel_to_grid () 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)); @@ -808,6 +899,7 @@ DCPPanel::add_video_panel_to_grid () _video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2)); } + int DCPPanel::minimum_allowed_audio_channels () const { @@ -823,6 +915,7 @@ DCPPanel::minimum_allowed_audio_channels () const return min; } + wxPanel * DCPPanel::make_audio_panel () { @@ -833,24 +926,38 @@ DCPPanel::make_audio_panel () 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 ()); + if (Config::instance()->allow_96khz_audio()) { + _audio_sample_rate_label = create_label (panel, _("Sample rate"), true); + _audio_sample_rate = new wxChoice (panel, wxID_ANY); + } + _processor_label = create_label (panel, _("Processor"), true); - _audio_processor = new wxChoice (panel, wxID_ANY); + _audio_processor = new Choice(panel); add_audio_processors (); - _show_audio = new Button (panel, _("Show audio...")); + _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 () { @@ -860,6 +967,12 @@ DCPPanel::add_audio_panel_to_grid () _audio_grid->Add (_audio_channels, wxGBPosition (r, 1)); ++r; + 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; + } + add_label_to_sizer (_audio_grid, _processor_label, true, wxGBPosition (r, 0)); _audio_grid->Add (_audio_processor, wxGBPosition (r, 1)); ++r; @@ -868,6 +981,7 @@ DCPPanel::add_audio_panel_to_grid () ++r; } + void DCPPanel::copy_isdcf_name_button_clicked () { @@ -875,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; } - auto 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 () { @@ -893,25 +1009,22 @@ DCPPanel::show_audio_clicked () return; } - if (_audio_dialog) { - _audio_dialog->Destroy (); - _audio_dialog = nullptr; - } - - auto d = new AudioDialog (_panel, _film, _viewer); - 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 () { @@ -922,12 +1035,47 @@ 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"))); + _audio_processor->add(_("None"), new wxStringClientData(N_("none"))); for (auto ap: AudioProcessor::visible()) { - _audio_processor->Append (std_to_wx(ap->name()), new wxStringClientData(std_to_wx(ap->id()))); + _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); + } +} +