X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=732468c840c680490a38b6b2d9e012fc98d60cbb;hp=fd63abf6ca050b9624e799db0438abb3d4be2dab;hb=8ccbe70f3c2f5db9e88978a98f3ad5735ece07ab;hpb=462ecb47dfbcbcc020a955a8592f55ec2dd9b5aa diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index fd63abf6c..732468c84 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_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,12 +18,16 @@ */ -#include "audio_panel.h" + +#include "audio_dialog.h" #include "audio_mapping_view.h" -#include "wx_util.h" -#include "gain_calculator_dialog.h" +#include "audio_panel.h" +#include "check_box.h" #include "content_panel.h" -#include "audio_dialog.h" +#include "dcpomatic_button.h" +#include "gain_calculator_dialog.h" +#include "static_text.h" +#include "wx_util.h" #include "lib/config.h" #include "lib/ffmpeg_audio_stream.h" #include "lib/ffmpeg_content.h" @@ -32,38 +36,39 @@ #include "lib/dcp_content.h" #include "lib/audio_content.h" #include -#include #include + using std::vector; using std::cout; using std::string; using std::list; using std::pair; -using boost::dynamic_pointer_cast; -using boost::shared_ptr; +using std::make_shared; +using std::dynamic_pointer_cast; +using std::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + AudioPanel::AudioPanel (ContentPanel* p) : ContentSubPanel (p, _("Audio")) , _audio_dialog (0) { - wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - _sizer->Add (grid, 0, wxALL, 8); - - int r = 0; - - _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's audio as OV and make VF")); - grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 3)); - ++r; - - _show = new wxButton (this, wxID_ANY, _("Show graph of audio levels...")); - grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2)); - _peak = new wxStaticText (this, wxID_ANY, wxT ("")); - grid->Add (_peak, wxGBPosition (r, 2), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL); - ++r; - - add_label_to_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0)); + _reference = new CheckBox (this, _("Use this DCP's audio as OV and make VF")); + _reference_note = new StaticText (this, wxT("")); + _reference_note->Wrap (200); + auto font = _reference_note->GetFont(); + font.SetStyle(wxFONTSTYLE_ITALIC); + font.SetPointSize(font.GetPointSize() - 1); + _reference_note->SetFont(font); + + _show = new Button (this, _("Show graph of audio levels...")); + _peak = new StaticText (this, wxT ("")); + + _gain_label = create_label (this, _("Gain"), true); _gain = new ContentSpinCtrlDouble ( this, new wxSpinCtrlDouble (this), @@ -73,13 +78,10 @@ AudioPanel::AudioPanel (ContentPanel* p) boost::mem_fn (&AudioContent::set_gain) ); - _gain->add (grid, wxGBPosition (r, 1)); - add_label_to_sizer (grid, this, _("dB"), false, wxGBPosition (r, 2)); - _gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate...")); - grid->Add (_gain_calculate_button, wxGBPosition (r, 3)); - ++r; + _gain_db_label = create_label (this, _("dB"), false); + _gain_calculate_button = new Button (this, _("Calculate...")); - add_label_to_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0)); + _delay_label = create_label (this, _("Delay"), true); _delay = new ContentSpinCtrl ( this, new wxSpinCtrl (this), @@ -89,59 +91,96 @@ AudioPanel::AudioPanel (ContentPanel* p) boost::mem_fn (&AudioContent::set_delay) ); - _delay->add (grid, wxGBPosition (r, 1)); /// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time - add_label_to_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2)); - ++r; + _delay_ms_label = create_label (this, _("ms"), false); - _mapping = new AudioMappingView (this); + _mapping = new AudioMappingView (this, _("Content"), _("content"), _("DCP"), _("DCP")); _sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6); - ++r; - _description = new wxStaticText (this, wxID_ANY, wxT (" \n"), wxDefaultPosition, wxDefaultSize); + _description = new StaticText (this, wxT(" \n"), wxDefaultPosition, wxDefaultSize); _sizer->Add (_description, 0, wxALL, 12); - wxFont font = _description->GetFont(); - font.SetStyle (wxFONTSTYLE_ITALIC); - font.SetPointSize (font.GetPointSize() - 1); _description->SetFont (font); - ++r; _gain->wrapped()->SetRange (-60, 60); _gain->wrapped()->SetDigits (1); _gain->wrapped()->SetIncrement (0.5); _delay->wrapped()->SetRange (-1000, 1000); + content_selection_changed (); + film_changed (Film::Property::AUDIO_CHANNELS); + film_changed (Film::Property::VIDEO_FRAME_RATE); + film_changed (Film::Property::REEL_TYPE); + _reference->Bind (wxEVT_CHECKBOX, boost::bind (&AudioPanel::reference_clicked, this)); _show->Bind (wxEVT_BUTTON, boost::bind (&AudioPanel::show_clicked, this)); _gain_calculate_button->Bind (wxEVT_BUTTON, boost::bind (&AudioPanel::gain_calculate_button_clicked, this)); _mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1)); + _active_jobs_connection = JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2)); + + add_to_grid (); +} + +void +AudioPanel::add_to_grid () +{ + int r = 0; + + auto reference_sizer = new wxBoxSizer (wxVERTICAL); + reference_sizer->Add (_reference, 0); + reference_sizer->Add (_reference_note, 0); + _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4)); + ++r; + + _grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2)); + _grid->Add (_peak, wxGBPosition (r, 2), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL); + ++r; + + add_label_to_sizer (_grid, _gain_label, true, wxGBPosition(r, 0)); + { + auto s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP); + s->Add (_gain_db_label, 0, wxALIGN_CENTER_VERTICAL); + _grid->Add (s, wxGBPosition(r, 1)); + } + + _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + ++r; - JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1)); + add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0)); + auto s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP); + s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL); + _grid->Add (s, wxGBPosition(r, 1)); + ++r; } AudioPanel::~AudioPanel () { if (_audio_dialog) { _audio_dialog->Destroy (); - _audio_dialog = 0; + _audio_dialog = nullptr; } } void AudioPanel::film_changed (Film::Property property) { + if (!_parent->film()) { + return; + } + switch (property) { - case Film::AUDIO_CHANNELS: - case Film::AUDIO_PROCESSOR: + case Film::Property::AUDIO_CHANNELS: + case Film::Property::AUDIO_PROCESSOR: _mapping->set_output_channels (_parent->film()->audio_output_names ()); setup_peak (); break; - case Film::VIDEO_FRAME_RATE: + case Film::Property::VIDEO_FRAME_RATE: setup_description (); break; - case Film::REEL_TYPE: - case Film::INTEROP: + case Film::Property::REEL_TYPE: + case Film::Property::INTEROP: setup_sensitivity (); break; default: @@ -152,7 +191,7 @@ AudioPanel::film_changed (Film::Property property) void AudioPanel::film_content_changed (int property) { - ContentList ac = _parent->selected_audio (); + auto ac = _parent->selected_audio (); if (property == AudioContentProperty::STREAMS) { if (ac.size() == 1) { _mapping->set (ac.front()->audio->mapping()); @@ -160,8 +199,8 @@ AudioPanel::film_content_changed (int property) vector groups; int c = 0; - BOOST_FOREACH (shared_ptr i, ac.front()->audio->streams()) { - shared_ptr f = dynamic_pointer_cast (i); + for (auto i: ac.front()->audio->streams()) { + auto f = dynamic_pointer_cast (i); string name = ""; if (f) { name = f->name; @@ -179,7 +218,7 @@ AudioPanel::film_content_changed (int property) } setup_description (); setup_peak (); - _sizer->Layout (); + layout (); } else if (property == AudioContentProperty::GAIN) { setup_peak (); } else if (property == DCPContentProperty::REFERENCE_AUDIO) { @@ -199,45 +238,50 @@ AudioPanel::film_content_changed (int property) void AudioPanel::gain_calculate_button_clicked () { - GainCalculatorDialog* d = new GainCalculatorDialog (this); - int const r = d->ShowModal (); + auto d = new GainCalculatorDialog (this); + auto const r = d->ShowModal (); + auto c = d->db_change(); - if (r == wxID_CANCEL || d->wanted_fader() == 0 || d->actual_fader() == 0) { + if (r == wxID_CANCEL || !c) { d->Destroy (); return; } - _gain->wrapped()->SetValue ( - Config::instance()->cinema_sound_processor()->db_for_fader_change ( - d->wanted_fader (), - d->actual_fader () - ) - ); + auto old_peak_dB = peak (); + auto old_value = _gain->wrapped()->GetValue(); + _gain->wrapped()->SetValue(old_value + *c); /* This appears to be necessary, as the change is not signalled, I think. */ _gain->view_changed (); + auto peak_dB = peak (); + if (old_peak_dB && *old_peak_dB < -0.5 && peak_dB && *peak_dB > -0.5) { + error_dialog (this, _("It is not possible to adjust the content's gain for this fader change as it would cause the DCP's audio to clip. The gain has not been changed.")); + _gain->wrapped()->SetValue (old_value); + _gain->view_changed (); + } + d->Destroy (); } void AudioPanel::setup_description () { - ContentList ac = _parent->selected_audio (); + auto ac = _parent->selected_audio (); if (ac.size () != 1) { checked_set (_description, wxT ("")); return; } - checked_set (_description, ac.front()->audio->processing_description ()); + checked_set (_description, ac.front()->audio->processing_description(_parent->film())); } void AudioPanel::mapping_changed (AudioMapping m) { - ContentList c = _parent->selected_audio (); + auto c = _parent->selected_audio (); if (c.size() == 1) { c.front()->audio->set_mapping (m); } @@ -246,12 +290,13 @@ AudioPanel::mapping_changed (AudioMapping m) void AudioPanel::content_selection_changed () { - ContentList sel = _parent->selected_audio (); + auto sel = _parent->selected_audio (); _gain->set_content (sel); _delay->set_content (sel); film_content_changed (AudioContentProperty::STREAMS); + film_content_changed (AudioContentProperty::GAIN); film_content_changed (DCPContentProperty::REFERENCE_AUDIO); setup_sensitivity (); @@ -260,34 +305,33 @@ AudioPanel::content_selection_changed () void AudioPanel::setup_sensitivity () { - ContentList sel = _parent->selected_audio (); + auto sel = _parent->selected_audio (); shared_ptr dcp; if (sel.size() == 1) { dcp = dynamic_pointer_cast (sel.front ()); } - list why_not; - bool const can_reference = dcp && dcp->can_reference_audio (why_not); - setup_refer_button (_reference, dcp, can_reference, why_not); - - if (_reference->GetValue ()) { - _gain->wrapped()->Enable (false); - _gain_calculate_button->Enable (false); - _show->Enable (true); - _peak->Enable (false); - _delay->wrapped()->Enable (false); - _mapping->Enable (false); - _description->Enable (false); + string why_not; + bool const can_reference = dcp && dcp->can_reference_audio (_parent->film(), why_not); + wxString cannot; + if (why_not.empty()) { + cannot = _("Cannot reference this DCP's audio."); } else { - _gain->wrapped()->Enable (sel.size() == 1); - _gain_calculate_button->Enable (sel.size() == 1); - _show->Enable (sel.size() == 1); - _peak->Enable (sel.size() == 1); - _delay->wrapped()->Enable (sel.size() == 1); - _mapping->Enable (sel.size() == 1); - _description->Enable (sel.size() == 1); + cannot = _("Cannot reference this DCP's audio: ") + std_to_wx(why_not); } + setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot); + + auto const ref = _reference->GetValue(); + auto const single = sel.size() == 1; + + _gain->wrapped()->Enable (!ref); + _gain_calculate_button->Enable (!ref && single); + _show->Enable (single); + _peak->Enable (!ref && single); + _delay->wrapped()->Enable (!ref); + _mapping->Enable (!ref && single); + _description->Enable (!ref && single); } void @@ -295,39 +339,57 @@ AudioPanel::show_clicked () { if (_audio_dialog) { _audio_dialog->Destroy (); - _audio_dialog = 0; + _audio_dialog = nullptr; } - ContentList ac = _parent->selected_audio (); + auto ac = _parent->selected_audio (); if (ac.size() != 1) { return; } - _audio_dialog = new AudioDialog (this, _parent->film (), ac.front ()); + _audio_dialog = new AudioDialog (this, _parent->film(), _parent->film_viewer(), ac.front()); _audio_dialog->Show (); } +/** @return If there is one selected piece of audio content, return its peak value in dB (if known) */ +optional +AudioPanel::peak () const +{ + optional peak_dB; + + auto sel = _parent->selected_audio (); + if (sel.size() == 1) { + auto playlist = make_shared(); + playlist->add (_parent->film(), sel.front()); + try { + auto analysis = make_shared(_parent->film()->audio_analysis_path(playlist)); + peak_dB = linear_to_db(analysis->overall_sample_peak().first.peak) + analysis->gain_correction(playlist); + } catch (...) { + + } + } + + return peak_dB; +} + void AudioPanel::setup_peak () { - ContentList sel = _parent->selected_audio (); - optional peak_dB; + auto sel = _parent->selected_audio (); + auto peak_dB = peak (); if (sel.size() != 1) { - _peak->SetLabel (wxT ("")); + _peak->SetLabel (wxT("")); } else { - shared_ptr playlist (new Playlist); - playlist->add (sel.front ()); - try { - shared_ptr analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist))); - peak_dB = 20 * log10 (analysis->overall_sample_peak().first.peak) + analysis->gain_correction (playlist); - _peak->SetLabel (wxString::Format (_("Peak: %.2fdB"), *peak_dB)); - } catch (...) { + peak_dB = peak (); + if (peak_dB) { + _peak->SetLabel (wxString::Format(_("Peak: %.2fdB"), *peak_dB)); + } else { _peak->SetLabel (_("Peak: unknown")); } } - static wxColour normal = _peak->GetForegroundColour (); + static auto normal = _peak->GetForegroundColour (); if (peak_dB && *peak_dB > -0.5) { _peak->SetForegroundColour (wxColour (255, 0, 0)); @@ -339,22 +401,25 @@ AudioPanel::setup_peak () } void -AudioPanel::active_jobs_changed (optional j) +AudioPanel::active_jobs_changed (optional old_active, optional new_active) { - if (j && *j == "analyse_audio") { + if (old_active && *old_active == "analyse_audio") { setup_peak (); + _mapping->Enable (true); + } else if (new_active && *new_active == "analyse_audio") { + _mapping->Enable (false); } } void AudioPanel::reference_clicked () { - ContentList c = _parent->selected (); + auto c = _parent->selected (); if (c.size() != 1) { return; } - shared_ptr d = dynamic_pointer_cast (c.front ()); + auto d = dynamic_pointer_cast(c.front()); if (!d) { return; } @@ -368,6 +433,7 @@ AudioPanel::set_film (shared_ptr) /* We are changing film, so destroy any audio dialog for the old one */ if (_audio_dialog) { _audio_dialog->Destroy (); - _audio_dialog = 0; + _audio_dialog = nullptr; } } +