X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=e4cc0c558626b646a3209bdde7445d31306125a7;hb=7ec6c86c913fba820870565ee757fdf43ae47433;hp=4421b81b253f47afc53ad2cb044337521785d1bd;hpb=689fa55d1529ad88449ca464e9107c4dcc54d1cb;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 4421b81b2..e4cc0c558 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -27,40 +27,42 @@ #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 @@ -94,6 +96,10 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE ); + _enable_audio_language = new wxCheckBox (_panel, wxID_ANY, _("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); @@ -107,7 +113,7 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v _reel_type = new wxChoice (_panel, wxID_ANY); _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); @@ -132,6 +138,8 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v _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 (wxEVT_CHECKBOX, boost::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())); @@ -172,13 +180,22 @@ DCPPanel::add_to_grid () { 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; + { + 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; @@ -453,6 +470,18 @@ 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: + 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: @@ -477,13 +506,14 @@ 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) { @@ -596,6 +626,8 @@ 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); set_general_sensitivity(static_cast(_film)); } @@ -616,6 +648,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); @@ -746,22 +781,16 @@ DCPPanel::make_video_panel () _resolution_label = create_label (panel, _("Resolution"), true); _resolution = new wxChoice (panel, wxID_ANY); -#ifdef __WXGTK3__ - int const spin_width = 118; -#else - int const spin_width = 56; -#endif - _frame_rate_label = create_label (panel, _("Frame Rate"), true); _frame_rate_choice = new wxChoice (panel, wxID_ANY); - _frame_rate_spin = new SpinCtrl (panel, spin_width); + _frame_rate_spin = new SpinCtrl (panel, DCPOMATIC_SPIN_CTRL_WIDTH); setup_frame_rate_widget (); _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); - _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")); @@ -867,6 +896,9 @@ DCPPanel::make_audio_panel () _audio_channels = new wxChoice (panel, wxID_ANY); setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); + _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); add_audio_processors (); @@ -874,9 +906,13 @@ DCPPanel::make_audio_panel () _show_audio = new Button (panel, _("Show graph of audio levels...")); _audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_channels_changed, this)); + _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)); + _audio_sample_rate->Append (_("48kHz")); + _audio_sample_rate->Append (_("96kHz")); + add_audio_panel_to_grid (); return panel; @@ -892,6 +928,10 @@ DCPPanel::add_audio_panel_to_grid () _audio_grid->Add (_audio_channels, wxGBPosition (r, 1)); ++r; + 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; @@ -969,3 +1009,35 @@ DCPPanel::add_audio_processors () } _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 = new LanguageTagDialog (_panel, *_film->audio_language()); + d->ShowModal (); + _film->set_audio_language(d->get()); + d->Destroy (); +} + + +void +DCPPanel::audio_sample_rate_changed () +{ + _film->set_audio_frame_rate (_audio_sample_rate->GetSelection() == 0 ? 48000 : 96000); +} +