X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=ab26329a4b878a564ecf9cd96e9eed8890f674db;hp=b7d6979d35f20e0988f0b3135c5f0e0acc6fac5f;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=b6c780d3107557d452c6612d715d01e2be52dbda diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index b7d6979d3..ab26329a4 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -1,43 +1,48 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2016 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 . */ -#include -#include -#include "lib/config.h" -#include "lib/ffmpeg_content.h" -#include "lib/ffmpeg_audio_stream.h" -#include "lib/audio_processor.h" -#include "lib/cinema_sound_processor.h" -#include "audio_dialog.h" #include "audio_panel.h" #include "audio_mapping_view.h" #include "wx_util.h" #include "gain_calculator_dialog.h" #include "content_panel.h" +#include "audio_dialog.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 using std::vector; using std::cout; 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; AudioPanel::AudioPanel (ContentPanel* p) : ContentSubPanel (p, _("Audio")) @@ -48,50 +53,47 @@ AudioPanel::AudioPanel (ContentPanel* p) int r = 0; - _show = new wxButton (this, wxID_ANY, _("Show Audio...")); - grid->Add (_show, wxGBPosition (r, 0)); + _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP")); + grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - add_label_to_grid_bag_sizer (grid, this, _("Gain"), true, wxGBPosition (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; + + add_label_to_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0)); _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)); + 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; - add_label_to_grid_bag_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0)); + add_label_to_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0)); _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)); + add_label_to_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2)); ++r; - add_label_to_grid_bag_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0)); - _stream = new wxChoice (this, wxID_ANY); - grid->Add (_stream, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND); - ++r; - - add_label_to_grid_bag_sizer (grid, this, _("Process with"), true, wxGBPosition (r, 0)); - _processor = new wxChoice (this, wxID_ANY); - setup_processors (); - grid->Add (_processor, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND); - ++r; - _mapping = new AudioMappingView (this); _sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6); ++r; @@ -109,26 +111,37 @@ AudioPanel::AudioPanel (ContentPanel* p) _gain->wrapped()->SetIncrement (0.5); _delay->wrapped()->SetRange (-1000, 1000); - _stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&AudioPanel::stream_changed, 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)); - _processor->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&AudioPanel::processor_changed, this)); + _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)); + + _mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1)); - _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1)); + JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1)); } +AudioPanel::~AudioPanel () +{ + if (_audio_dialog) { + _audio_dialog->Destroy (); + _audio_dialog = 0; + } +} void AudioPanel::film_changed (Film::Property property) { switch (property) { case Film::AUDIO_CHANNELS: - _mapping->set_channels (_parent->film()->audio_channels ()); - _sizer->Layout (); + case Film::AUDIO_PROCESSOR: + _mapping->set_output_channels (_parent->film()->audio_output_names ()); + setup_peak (); break; case Film::VIDEO_FRAME_RATE: setup_description (); break; + case Film::REEL_TYPE: + setup_sensitivity (); default: break; } @@ -137,40 +150,47 @@ AudioPanel::film_changed (Film::Property property) void AudioPanel::film_content_changed (int property) { - AudioContentList ac = _parent->selected_audio (); - shared_ptr acs; - shared_ptr fcs; - if (ac.size() == 1) { - acs = ac.front (); - fcs = dynamic_pointer_cast (acs); - } - - if (property == AudioContentProperty::AUDIO_MAPPING) { - _mapping->set (acs ? acs->audio_mapping () : AudioMapping ()); - _sizer->Layout (); - } else if (property == AudioContentProperty::AUDIO_FRAME_RATE) { - setup_description (); - } else if (property == FFmpegContentProperty::AUDIO_STREAM) { - _mapping->set (acs ? acs->audio_mapping () : AudioMapping ()); - _sizer->Layout (); - } else if (property == FFmpegContentProperty::AUDIO_STREAMS) { - _stream->Clear (); - if (fcs) { - vector > a = fcs->audio_streams (); - for (vector >::iterator i = a.begin(); i != a.end(); ++i) { - _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ()))); - } - - if (fcs->audio_stream()) { - checked_set (_stream, fcs->audio_stream()->identifier ()); + 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 ()); + + 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 ()); } - } else if (property == AudioContentProperty::AUDIO_PROCESSOR) { - if (acs) { - checked_set (_processor, acs->audio_processor() ? acs->audio_processor()->id() : N_("none")); + setup_description (); + setup_peak (); + _sizer->Layout (); + } else if (property == AudioContentProperty::GAIN) { + setup_peak (); + } else if (property == DCPContentProperty::REFERENCE_AUDIO) { + if (ac.size() == 1) { + shared_ptr dcp = dynamic_pointer_cast (ac.front ()); + checked_set (_reference, dcp ? dcp->reference_audio () : false); } else { - checked_set (_processor, N_("none")); + checked_set (_reference, false); } + + setup_sensitivity (); + } else if (property == ContentProperty::VIDEO_FRAME_RATE) { + setup_description (); } } @@ -178,13 +198,13 @@ void AudioPanel::gain_calculate_button_clicked () { GainCalculatorDialog* d = new GainCalculatorDialog (this); - d->ShowModal (); + int const r = d->ShowModal (); - if (d->wanted_fader() == 0 || d->actual_fader() == 0) { + if (r == wxID_CANCEL || d->wanted_fader() == 0 || d->actual_fader() == 0) { d->Destroy (); return; } - + _gain->wrapped()->SetValue ( Config::instance()->cinema_sound_processor()->db_for_fader_change ( d->wanted_fader (), @@ -196,143 +216,159 @@ AudioPanel::gain_calculate_button_clicked () I think. */ _gain->view_changed (); - + d->Destroy (); } void -AudioPanel::show_clicked () +AudioPanel::setup_description () { - if (_audio_dialog) { - _audio_dialog->Destroy (); - _audio_dialog = 0; - } - - AudioContentList ac = _parent->selected_audio (); - if (ac.size() != 1) { + ContentList ac = _parent->selected_audio (); + if (ac.size () != 1) { + checked_set (_description, wxT ("")); return; } - - _audio_dialog = new AudioDialog (this); - _audio_dialog->Show (); - _audio_dialog->set_content (ac.front ()); + + checked_set (_description, ac.front()->audio->processing_description ()); } void -AudioPanel::stream_changed () +AudioPanel::mapping_changed (AudioMapping m) { - FFmpegContentList fc = _parent->selected_ffmpeg (); - if (fc.size() != 1) { - return; + ContentList c = _parent->selected_audio (); + if (c.size() == 1) { + c.front()->audio->set_mapping (m); } +} - shared_ptr fcs = fc.front (); - - if (_stream->GetSelection() == -1) { - return; - } - - vector > a = fcs->audio_streams (); - vector >::iterator i = a.begin (); - string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ())); - while (i != a.end() && (*i)->identifier () != s) { - ++i; +void +AudioPanel::content_selection_changed () +{ + ContentList sel = _parent->selected_audio (); + + _gain->set_content (sel); + _delay->set_content (sel); + + film_content_changed (AudioContentProperty::STREAMS); + film_content_changed (DCPContentProperty::REFERENCE_AUDIO); + + setup_sensitivity (); +} + +void +AudioPanel::setup_sensitivity () +{ + ContentList sel = _parent->selected_audio (); + + shared_ptr dcp; + if (sel.size() == 1) { + dcp = dynamic_pointer_cast (sel.front ()); } - if (i != a.end ()) { - fcs->set_audio_stream (*i); + 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); + _peak->Enable (false); + _delay->wrapped()->Enable (false); + _mapping->Enable (false); + _description->Enable (false); + } else { + _gain->wrapped()->Enable (true); + _gain_calculate_button->Enable (sel.size() == 1); + _peak->Enable (true); + _delay->wrapped()->Enable (true); + _mapping->Enable (sel.size() == 1); + _description->Enable (true); } } void -AudioPanel::processor_changed () +AudioPanel::show_clicked () { - string const s = string_client_data (_processor->GetClientObject (_processor->GetSelection ())); - AudioProcessor const * p = 0; - if (s != wx_to_std (N_("none"))) { - p = AudioProcessor::from_id (s); + if (_audio_dialog) { + _audio_dialog->Destroy (); + _audio_dialog = 0; } - - AudioContentList c = _parent->selected_audio (); - for (AudioContentList::const_iterator i = c.begin(); i != c.end(); ++i) { - (*i)->set_audio_processor (p); + + ContentList ac = _parent->selected_audio (); + if (ac.size() != 1) { + return; } + + _audio_dialog = new AudioDialog (this, _parent->film (), ac.front ()); + _audio_dialog->Show (); } void -AudioPanel::setup_description () +AudioPanel::setup_peak () { - AudioContentList ac = _parent->selected_audio (); - if (ac.size () != 1) { - _description->SetLabel (""); - return; + ContentList sel = _parent->selected_audio (); + bool alert = false; + + if (sel.size() != 1) { + _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))); + if (analysis->sample_peak ()) { + float const peak_dB = 20 * log10 (analysis->sample_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")); + } + } catch (...) { + _peak->SetLabel (_("Peak: unknown")); + } } - shared_ptr acs = ac.front (); - if (acs->audio_frame_rate() != acs->resampled_audio_frame_rate ()) { - _description->SetLabel (wxString::Format ( - _("Audio will be resampled from %.3fkHz to %.3fkHz."), - acs->audio_frame_rate() / 1000.0, - acs->resampled_audio_frame_rate() / 1000.0 - )); + static wxColour normal = _peak->GetForegroundColour (); + + if (alert) { + _peak->SetForegroundColour (wxColour (255, 0, 0)); } else { - _description->SetLabel (_("Audio will not be resampled.")); + _peak->SetForegroundColour (normal); } } void -AudioPanel::mapping_changed (AudioMapping m) +AudioPanel::active_jobs_changed (optional j) { - AudioContentList c = _parent->selected_audio (); - if (c.size() == 1) { - c.front()->set_audio_mapping (m); + if (j && *j == "analyse_audio") { + setup_peak (); } } void -AudioPanel::content_selection_changed () +AudioPanel::reference_clicked () { - AudioContentList sel = _parent->selected_audio (); - - if (_audio_dialog && sel.size() == 1) { - _audio_dialog->set_content (sel.front ()); + ContentList c = _parent->selected (); + if (c.size() != 1) { + return; } - - _gain->set_content (sel); - _delay->set_content (sel); - _gain_calculate_button->Enable (sel.size() == 1); - _show->Enable (sel.size() == 1); - _stream->Enable (sel.size() == 1); - _processor->Enable (!sel.empty()); - _mapping->Enable (sel.size() == 1); - - setup_processors (); + shared_ptr d = dynamic_pointer_cast (c.front ()); + if (!d) { + return; + } - film_content_changed (AudioContentProperty::AUDIO_MAPPING); - film_content_changed (AudioContentProperty::AUDIO_PROCESSOR); - film_content_changed (AudioContentProperty::AUDIO_FRAME_RATE); - film_content_changed (FFmpegContentProperty::AUDIO_STREAM); - film_content_changed (FFmpegContentProperty::AUDIO_STREAMS); + d->set_reference_audio (_reference->GetValue ()); } void -AudioPanel::setup_processors () +AudioPanel::set_film (shared_ptr) { - AudioContentList sel = _parent->selected_audio (); - - _processor->Clear (); - list ap = AudioProcessor::all (); - _processor->Append (_("None"), new wxStringClientData (N_("none"))); - for (list::const_iterator i = ap.begin(); i != ap.end(); ++i) { - - AudioContentList::const_iterator j = sel.begin(); - while (j != sel.end() && (*i)->in_channels().includes ((*j)->audio_channels ())) { - ++j; - } - - if (j == sel.end ()) { - _processor->Append (std_to_wx ((*i)->name ()), new wxStringClientData (std_to_wx ((*i)->id ()))); - } + /* We are changing film, so destroy any audio dialog for the old one */ + if (_audio_dialog) { + _audio_dialog->Destroy (); + _audio_dialog = 0; } }