X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=88eae5141b66f5f9dba363da59f46f015be5cf9e;hb=ff40ecd114547a2fc07bc49403c993c3fa5d40cc;hp=dad1981f44c9d3cc2927af12fa962ce4e0d6a234;hpb=19f94521139aac13ef8fb4eaa55855b2ada307b4;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index dad1981f4..88eae5141 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -1,19 +1,20 @@ /* 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 . */ @@ -24,6 +25,7 @@ #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" @@ -46,15 +48,26 @@ 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_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; - _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 ("")); @@ -98,9 +111,6 @@ AudioPanel::AudioPanel (ContentPanel* p) _description = new wxStaticText (this, wxID_ANY, 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; @@ -109,13 +119,13 @@ AudioPanel::AudioPanel (ContentPanel* p) _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)); + _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)); - JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1)); + JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2)); } AudioPanel::~AudioPanel () @@ -139,7 +149,9 @@ AudioPanel::film_changed (Film::Property property) setup_description (); break; case Film::REEL_TYPE: + case Film::INTEROP: setup_sensitivity (); + break; default: break; } @@ -153,6 +165,23 @@ AudioPanel::film_content_changed (int property) 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 ()); } @@ -246,24 +275,26 @@ AudioPanel::setup_sensitivity () dcp = dynamic_pointer_cast (sel.front ()); } - list why_not; + string why_not; bool const can_reference = dcp && dcp->can_reference_audio (why_not); - setup_refer_button (_reference, dcp, can_reference, why_not); + setup_refer_button (_reference, _reference_note, 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); } 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); } } @@ -288,7 +319,7 @@ void AudioPanel::setup_peak () { ContentList sel = _parent->selected_audio (); - bool alert = false; + optional peak_dB; if (sel.size() != 1) { _peak->SetLabel (wxT ("")); @@ -297,15 +328,8 @@ AudioPanel::setup_peak () 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")); - } + 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")); } @@ -313,18 +337,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); } } @@ -343,3 +372,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; + } +}