X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=d8aa3ac460986acb4e096cdd2b73ac2c31531184;hb=62c03e3d3493df8a31361b3281c443cac35decb0;hp=78f5fc526682a94141abc0d5529784e91cfefd2a;hpb=cf9e7b9d0fb2545139dbd9bdc4c3313e7312ac66;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 78f5fc526..d8aa3ac46 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -24,6 +24,7 @@ #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" @@ -32,43 +33,44 @@ #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) +DCPPanel::DCPPanel(wxNotebook* n, shared_ptr film, FilmViewer& viewer) : _film (film) , _viewer (viewer) , _generally_sensitive (true) @@ -95,12 +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 wxCheckBox (_panel, wxID_ANY, _("Audio language")); + _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")); @@ -109,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 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...")); @@ -128,31 +130,31 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr film, weak_ptr v _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)); + _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 (wxEVT_CHECKBOX, boost::bind(&DCPPanel::encrypted_toggled, 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 (wxEVT_CHECKBOX, boost::bind(&DCPPanel::enable_audio_language_toggled, 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_length->SetRange (1, 64); - _standard->Append (_("SMPTE")); - _standard->Append (_("Interop")); + _standard->add(_("SMPTE")); + _standard->add(_("Interop")); Config::instance()->Changed.connect (boost::bind(&DCPPanel::config_changed, this, _1)); @@ -264,13 +266,13 @@ DCPPanel::encrypted_toggled () 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 ); @@ -296,29 +298,29 @@ 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) { + if (!_film || !_standard->get()) { return; } - _film->set_interop (_standard->GetSelection() == 1); + _film->set_interop(*_standard->get() == 1); } @@ -478,6 +480,11 @@ DCPPanel::film_changed (Film::Property p) 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: @@ -506,7 +513,8 @@ DCPPanel::film_content_changed (int property) 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 || @@ -550,11 +558,11 @@ DCPPanel::container_changed () return; } - int const n = _container->GetSelection (); - if (n >= 0) { + auto const n = _container->get(); + if (n) { auto ratios = Ratio::containers (); - DCPOMATIC_ASSERT (n < int(ratios.size())); - _film->set_container (ratios[n]); + DCPOMATIC_ASSERT(*n < int(ratios.size())); + _film->set_container(ratios[*n]); } } @@ -567,9 +575,9 @@ 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)); } } @@ -622,6 +630,7 @@ DCPPanel::set_film (shared_ptr film) 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)); } @@ -769,14 +778,14 @@ 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_choice = new Choice(panel); _frame_rate_spin = new SpinCtrl (panel, DCPOMATIC_SPIN_CTRL_WIDTH); setup_frame_rate_widget (); _best_frame_rate = new Button (panel, _("Use best")); @@ -797,22 +806,22 @@ 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 (); @@ -887,19 +896,32 @@ 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 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; @@ -915,6 +937,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; @@ -935,11 +963,11 @@ DCPPanel::copy_isdcf_name_button_clicked () 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)); } @@ -964,11 +992,11 @@ DCPPanel::show_audio_clicked () 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())); } @@ -986,9 +1014,9 @@ DCPPanel::reel_length_changed () 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(); } @@ -1012,8 +1040,18 @@ 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()); + if (d->ShowModal() == wxID_OK) { + _film->set_audio_language(d->get()); + } d->Destroy (); } + +void +DCPPanel::audio_sample_rate_changed () +{ + if (_audio_sample_rate) { + _film->set_audio_frame_rate (_audio_sample_rate->GetSelection() == 0 ? 48000 : 96000); + } +} +