X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=df8c7871ecdbdd0a890406611eb6ebd091de8eba;hb=80df3d1089235348a802128a47a0078c6a6cae85;hp=b89cbb01fc34f7b1cc30ef3670a7ac7a6a78d3ef;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index b89cbb01f..df8c7871e 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-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 . */ @@ -27,8 +28,9 @@ #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 @@ -38,7 +40,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; @@ -51,43 +52,45 @@ AudioPanel::AudioPanel (ContentPanel* p) int r = 0; - { - 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; - } + _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP")); + grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++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_grid_bag_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0)); + 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; _mapping = new AudioMappingView (this); @@ -107,8 +110,9 @@ AudioPanel::AudioPanel (ContentPanel* p) _gain->wrapped()->SetIncrement (0.5); _delay->wrapped()->SetRange (-1000, 1000); - _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)); + _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)); @@ -135,6 +139,8 @@ AudioPanel::film_changed (Film::Property property) case Film::VIDEO_FRAME_RATE: setup_description (); break; + case Film::REEL_TYPE: + setup_sensitivity (); default: break; } @@ -143,19 +149,30 @@ AudioPanel::film_changed (Film::Property property) void AudioPanel::film_content_changed (int property) { - if (property == AudioContentProperty::AUDIO_STREAMS) { - AudioContentList ac = _parent->selected_audio (); + 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 ()); } 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) { + shared_ptr dcp = dynamic_pointer_cast (ac.front ()); + checked_set (_reference, dcp ? dcp->reference_audio () : false); + } else { + checked_set (_reference, false); + } + + setup_sensitivity (); + } else if (property == ContentProperty::VIDEO_FRAME_RATE) { + setup_description (); } } @@ -188,36 +205,67 @@ 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 ()); } 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); - _gain_calculate_button->Enable (sel.size() == 1); - _mapping->Enable (sel.size() == 1); + film_content_changed (AudioContentProperty::STREAMS); + film_content_changed (DCPContentProperty::REFERENCE_AUDIO); - film_content_changed (AudioContentProperty::AUDIO_STREAMS); + setup_sensitivity (); +} + +void +AudioPanel::setup_sensitivity () +{ + ContentList 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); + _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 @@ -228,7 +276,7 @@ AudioPanel::show_clicked () _audio_dialog = 0; } - AudioContentList ac = _parent->selected_audio (); + ContentList ac = _parent->selected_audio (); if (ac.size() != 1) { return; } @@ -240,7 +288,7 @@ AudioPanel::show_clicked () void AudioPanel::setup_peak () { - AudioContentList sel = _parent->selected_audio (); + ContentList sel = _parent->selected_audio (); bool alert = false; if (sel.size() != 1) { @@ -250,8 +298,8 @@ AudioPanel::setup_peak () playlist->add (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 (analysis->sample_peak ()) { + float const peak_dB = 20 * log10 (analysis->sample_peak().get()) + analysis->gain_correction (playlist); if (peak_dB > -3) { alert = true; } @@ -280,3 +328,19 @@ AudioPanel::active_jobs_changed (optional j) setup_peak (); } } + +void +AudioPanel::reference_clicked () +{ + ContentList c = _parent->selected (); + if (c.size() != 1) { + return; + } + + shared_ptr d = dynamic_pointer_cast (c.front ()); + if (!d) { + return; + } + + d->set_reference_audio (_reference->GetValue ()); +}