X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Faudio_panel.cc;h=2809ce44a2faa7f3316da93aff7e96c9ef2e7060;hb=44da1840ca17d0945cb1886bb17218990850894c;hp=b60d5d1213f2ad728d48e7361476a080042b8e06;hpb=3ae67788dcb1567c5d6df65e89cd84bf484e82be;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index b60d5d121..2809ce44a 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-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -24,6 +24,9 @@ #include "gain_calculator_dialog.h" #include "content_panel.h" #include "audio_dialog.h" +#include "static_text.h" +#include "check_box.h" +#include "dcpomatic_button.h" #include "lib/config.h" #include "lib/ffmpeg_audio_stream.h" #include "lib/ffmpeg_content.h" @@ -43,38 +46,26 @@ using std::pair; using boost::dynamic_pointer_cast; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif AudioPanel::AudioPanel (ContentPanel* p) : ContentSubPanel (p, _("Audio")) , _audio_dialog (0) { - wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); - - _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's audio as OV and make VF")); - reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP); - - _reference_note = new wxStaticText (this, wxID_ANY, _("")); + _reference = new CheckBox (this, _("Use this DCP's audio as OV and make VF")); + _reference_note = new StaticText (this, wxT("")); _reference_note->Wrap (200); - reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); wxFont font = _reference_note->GetFont(); font.SetStyle(wxFONTSTYLE_ITALIC); font.SetPointSize(font.GetPointSize() - 1); _reference_note->SetFont(font); - _sizer->Add (reference_sizer); - - wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - _sizer->Add (grid, 0, wxALL, 8); - - int r = 0; - - _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; + _show = new Button (this, _("Show graph of audio levels...")); + _peak = new StaticText (this, wxT ("")); - add_label_to_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0)); + _gain_label = create_label (this, _("Gain"), true); _gain = new ContentSpinCtrlDouble ( this, new wxSpinCtrlDouble (this), @@ -84,13 +75,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), @@ -100,32 +88,68 @@ 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); _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::AUDIO_CHANNELS); + film_changed (Film::VIDEO_FRAME_RATE); + film_changed (Film::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 (); +} - JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1)); +void +AudioPanel::add_to_grid () +{ + int r = 0; + + wxBoxSizer* 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)); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + 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; + + add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0)); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL); + _grid->Add (s, wxGBPosition(r, 1)); + ++r; } AudioPanel::~AudioPanel () @@ -139,6 +163,10 @@ AudioPanel::~AudioPanel () void AudioPanel::film_changed (Film::Property property) { + if (!_parent->film()) { + return; + } + switch (property) { case Film::AUDIO_CHANNELS: case Film::AUDIO_PROCESSOR: @@ -209,24 +237,29 @@ AudioPanel::gain_calculate_button_clicked () { GainCalculatorDialog* d = new GainCalculatorDialog (this); int const r = d->ShowModal (); + optional 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 () - ) - ); + optional old_peak_dB = peak (); + double 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 (); + optional 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 (); } @@ -239,7 +272,7 @@ AudioPanel::setup_description () return; } - checked_set (_description, ac.front()->audio->processing_description ()); + checked_set (_description, ac.front()->audio->processing_description(_parent->film())); } void @@ -260,6 +293,7 @@ AudioPanel::content_selection_changed () _delay->set_content (sel); film_content_changed (AudioContentProperty::STREAMS); + film_content_changed (AudioContentProperty::GAIN); film_content_changed (DCPContentProperty::REFERENCE_AUDIO); setup_sensitivity (); @@ -276,8 +310,14 @@ AudioPanel::setup_sensitivity () } string why_not; - bool const can_reference = dcp && dcp->can_reference_audio (why_not); - setup_refer_button (_reference, _reference_note, dcp, can_reference, 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 { + cannot = _("Cannot reference this DCP's audio: ") + std_to_wx(why_not); + } + setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot); if (_reference->GetValue ()) { _gain->wrapped()->Enable (false); @@ -311,26 +351,44 @@ AudioPanel::show_clicked () 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; + + ContentList sel = _parent->selected_audio (); + if (sel.size() == 1) { + shared_ptr playlist (new Playlist); + playlist->add (_parent->film(), sel.front()); + try { + shared_ptr analysis (new AudioAnalysis(_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; + optional 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")); } } @@ -347,10 +405,13 @@ 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); } }