X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=5523d25393088196d88655581121b43f740c6522;hp=a4976b8c1bca172e888692f0aff3f78c71c3d429;hb=5d7ba3c7717288b13cb8b286474382580f3bdba9;hpb=4e6f15f602c605804f95c6b06af9bf79eaf2dde1 diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index a4976b8c1..5523d2539 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -23,13 +24,17 @@ #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" #include "lib/cinema_sound_processor.h" #include "lib/job_manager.h" #include "lib/dcp_content.h" +#include "lib/audio_content.h" #include -#include #include #include @@ -39,7 +44,6 @@ using std::string; using std::list; using std::pair; using boost::dynamic_pointer_cast; -using boost::lexical_cast; using boost::shared_ptr; using boost::optional; @@ -47,78 +51,119 @@ 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, _("Refer to existing DCP")); - grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2)); - ++r; - - { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _show = new wxButton (this, wxID_ANY, _("Show graph of audio levels...")); - s->Add (_show); - _peak = new wxStaticText (this, wxID_ANY, wxT ("")); - s->Add (_peak, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP); - grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2)); - ++r; - } - - add_label_to_grid_bag_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); + wxFont 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), - AudioContentProperty::AUDIO_GAIN, - boost::mem_fn (&AudioContent::audio_gain), - boost::mem_fn (&AudioContent::set_audio_gain) + AudioContentProperty::GAIN, + &Content::audio, + boost::mem_fn (&AudioContent::gain), + boost::mem_fn (&AudioContent::set_gain) ); - _gain->add (grid, wxGBPosition (r, 1)); - add_label_to_grid_bag_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_grid_bag_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0)); + _delay_label = create_label (this, _("Delay"), true); _delay = new ContentSpinCtrl ( this, new wxSpinCtrl (this), - AudioContentProperty::AUDIO_DELAY, - boost::mem_fn (&AudioContent::audio_delay), - boost::mem_fn (&AudioContent::set_audio_delay) + AudioContentProperty::DELAY, + &Content::audio, + boost::mem_fn (&AudioContent::delay), + 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_grid_bag_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); - _reference->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioPanel::reference_clicked, this)); - _show->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::show_clicked, this)); - _gain_calculate_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&AudioPanel::gain_calculate_button_clicked, this)); + 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)); - JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1)); + add_to_grid (); +} + +void +AudioPanel::add_to_grid () +{ + bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; + + int r = 0; + + _reference->Show (full); + _reference_note->Show (full); + + if (full) { + 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)); + } + + _gain_calculate_button->Show (full); + + if (full) { + _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + ++r; + } + + _delay_label->Show (full); + _delay->show (full); + _delay_ms_label->Show (full); + + if (full) { + 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 () @@ -132,6 +177,10 @@ AudioPanel::~AudioPanel () void AudioPanel::film_changed (Film::Property property) { + if (!_parent->film()) { + return; + } + switch (property) { case Film::AUDIO_CHANNELS: case Film::AUDIO_PROCESSOR: @@ -141,6 +190,10 @@ AudioPanel::film_changed (Film::Property property) case Film::VIDEO_FRAME_RATE: setup_description (); break; + case Film::REEL_TYPE: + case Film::INTEROP: + setup_sensitivity (); + break; default: break; } @@ -149,18 +202,35 @@ AudioPanel::film_changed (Film::Property property) void AudioPanel::film_content_changed (int property) { - AudioContentList ac = _parent->selected_audio (); - if (property == AudioContentProperty::AUDIO_STREAMS) { + ContentList ac = _parent->selected_audio (); + if (property == AudioContentProperty::STREAMS) { if (ac.size() == 1) { - _mapping->set (ac.front()->audio_mapping()); - _mapping->set_input_channels (ac.front()->audio_channel_names ()); + _mapping->set (ac.front()->audio->mapping()); + _mapping->set_input_channels (ac.front()->audio->channel_names ()); + + vector groups; + int c = 0; + BOOST_FOREACH (shared_ptr i, ac.front()->audio->streams()) { + shared_ptr f = dynamic_pointer_cast (i); + string name = ""; + if (f) { + name = f->name; + if (f->codec_name) { + name += " (" + f->codec_name.get() + ")"; + } + } + groups.push_back (AudioMappingView::Group (c, c + i->channels() - 1, name)); + c += i->channels (); + } + _mapping->set_input_groups (groups); + } else { _mapping->set (AudioMapping ()); } setup_description (); setup_peak (); _sizer->Layout (); - } else if (property == AudioContentProperty::AUDIO_GAIN) { + } else if (property == AudioContentProperty::GAIN) { setup_peak (); } else if (property == DCPContentProperty::REFERENCE_AUDIO) { if (ac.size() == 1) { @@ -171,6 +241,8 @@ AudioPanel::film_content_changed (int property) } setup_sensitivity (); + } else if (property == ContentProperty::VIDEO_FRAME_RATE) { + setup_description (); } } @@ -179,18 +251,14 @@ 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 () - ) - ); + _gain->wrapped()->SetValue(_gain->wrapped()->GetValue() + *c); /* This appears to be necessary, as the change is not signalled, I think. @@ -203,33 +271,35 @@ AudioPanel::gain_calculate_button_clicked () void AudioPanel::setup_description () { - AudioContentList ac = _parent->selected_audio (); + ContentList ac = _parent->selected_audio (); if (ac.size () != 1) { checked_set (_description, wxT ("")); return; } - checked_set (_description, ac.front()->processing_description ()); + checked_set (_description, ac.front()->audio->processing_description(_parent->film())); } void AudioPanel::mapping_changed (AudioMapping m) { - AudioContentList c = _parent->selected_audio (); + ContentList c = _parent->selected_audio (); if (c.size() == 1) { - c.front()->set_audio_mapping (m); + c.front()->audio->set_mapping (m); } } void AudioPanel::content_selection_changed () { - AudioContentList sel = _parent->selected_audio (); + ContentList sel = _parent->selected_audio (); _gain->set_content (sel); _delay->set_content (sel); - film_content_changed (AudioContentProperty::AUDIO_STREAMS); + film_content_changed (AudioContentProperty::STREAMS); + film_content_changed (AudioContentProperty::GAIN); + film_content_changed (DCPContentProperty::REFERENCE_AUDIO); setup_sensitivity (); } @@ -237,23 +307,39 @@ AudioPanel::content_selection_changed () void AudioPanel::setup_sensitivity () { - AudioContentList sel = _parent->selected_audio (); - _reference->Enable (sel.size() == 1 && dynamic_pointer_cast (sel.front ())); + ContentList sel = _parent->selected_audio (); + + shared_ptr dcp; + if (sel.size() == 1) { + dcp = dynamic_pointer_cast (sel.front ()); + } + + 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 { + 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); _gain_calculate_button->Enable (false); + _show->Enable (true); _peak->Enable (false); _delay->wrapped()->Enable (false); _mapping->Enable (false); _description->Enable (false); } else { - _gain->wrapped()->Enable (true); + _gain->wrapped()->Enable (sel.size() == 1); _gain_calculate_button->Enable (sel.size() == 1); - _peak->Enable (true); - _delay->wrapped()->Enable (true); + _show->Enable (sel.size() == 1); + _peak->Enable (sel.size() == 1); + _delay->wrapped()->Enable (sel.size() == 1); _mapping->Enable (sel.size() == 1); - _description->Enable (true); + _description->Enable (sel.size() == 1); } } @@ -265,7 +351,7 @@ AudioPanel::show_clicked () _audio_dialog = 0; } - AudioContentList ac = _parent->selected_audio (); + ContentList ac = _parent->selected_audio (); if (ac.size() != 1) { return; } @@ -277,25 +363,18 @@ AudioPanel::show_clicked () void AudioPanel::setup_peak () { - AudioContentList sel = _parent->selected_audio (); - bool alert = false; + ContentList sel = _parent->selected_audio (); + optional peak_dB; if (sel.size() != 1) { _peak->SetLabel (wxT ("")); } else { shared_ptr playlist (new Playlist); - playlist->add (sel.front ()); + playlist->add (_parent->film(), sel.front()); try { shared_ptr analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist))); - if (analysis->peak ()) { - float const peak_dB = 20 * log10 (analysis->peak().get()) + analysis->gain_correction (playlist); - if (peak_dB > -3) { - alert = true; - } - _peak->SetLabel (wxString::Format (_("Peak: %.2fdB"), peak_dB)); - } else { - _peak->SetLabel (_("Peak: unknown")); - } + peak_dB = 20 * log10 (analysis->overall_sample_peak().first.peak) + analysis->gain_correction (playlist); + _peak->SetLabel (wxString::Format (_("Peak: %.2fdB"), *peak_dB)); } catch (...) { _peak->SetLabel (_("Peak: unknown")); } @@ -303,18 +382,23 @@ AudioPanel::setup_peak () static wxColour normal = _peak->GetForegroundColour (); - if (alert) { + if (peak_dB && *peak_dB > -0.5) { _peak->SetForegroundColour (wxColour (255, 0, 0)); + } else if (peak_dB && *peak_dB > -3) { + _peak->SetForegroundColour (wxColour (186, 120, 0)); } else { _peak->SetForegroundColour (normal); } } 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); } } @@ -333,3 +417,13 @@ AudioPanel::reference_clicked () d->set_reference_audio (_reference->GetValue ()); } + +void +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; + } +}