X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=ebccd53f5f57cb68c0858cff177c63e7ef68269b;hp=7a13a24a08b54e51d8ae19f0b4a43e02383c41f8;hb=ad5c8849fc3ef5aad88201f28db5474a60db4436;hpb=5b7a58b4a4ef83866f21ebb755a1ddcfdb8c1c2a diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 7a13a24a0..ebccd53f5 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-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 . */ @@ -23,17 +24,43 @@ #include "lib/audio_analysis.h" #include "lib/film.h" #include "lib/analyse_audio_job.h" +#include "lib/audio_content.h" #include "lib/job_manager.h" -#include "lib/playlist.h" +#include #include +#include +#include +using std::cout; +using std::list; +using std::vector; +using std::pair; using boost::shared_ptr; using boost::bind; using boost::optional; - -AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) - : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) +using boost::const_pointer_cast; +using boost::dynamic_pointer_cast; + +/** @param content Content to analyse, or 0 to analyse all of the film's audio */ +AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptr content) + : wxDialog ( + parent, + wxID_ANY, + _("Audio"), + wxDefaultPosition, + wxSize (640, 512), +#ifdef DCPOMATIC_OSX + /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps + the window above all others (and not just our own) it's better than nothing for now. + */ + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP +#else + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT +#endif + ) , _film (film) + , _content (content) + , _channels (film->audio_channels ()) , _plot (0) { wxFont subheading_font (*wxNORMAL_FONT); @@ -41,13 +68,19 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); wxBoxSizer* lr_sizer = new wxBoxSizer (wxHORIZONTAL); - + wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); _plot = new AudioPlot (this); - left->Add (_plot, 1, wxALL | wxEXPAND, 12); - _peak_time = new wxStaticText (this, wxID_ANY, wxT ("")); - left->Add (_peak_time, 0, wxALL, 12); + left->Add (_plot, 1, wxTOP | wxEXPAND, 12); + _sample_peak = new wxStaticText (this, wxID_ANY, wxT ("")); + left->Add (_sample_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); + _true_peak = new wxStaticText (this, wxID_ANY, wxT ("")); + left->Add (_true_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); + _integrated_loudness = new wxStaticText (this, wxID_ANY, wxT ("")); + left->Add (_integrated_loudness, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); + _loudness_range = new wxStaticText (this, wxID_ANY, wxT ("")); + left->Add (_loudness_range, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); lr_sizer->Add (left, 1, wxALL, 12); @@ -59,10 +92,14 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16); } - for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) { + for (int i = 0; i < _channels; ++i) { _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i))); right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3); - _channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1)); + _channel_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::channel_clicked, this, _1)); + } + + for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) { + _channel_checkbox[i] = 0; } { @@ -70,7 +107,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) m->SetFont (subheading_font); right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); } - + wxString const types[] = { _("Peak"), _("RMS") @@ -79,7 +116,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) for (int i = 0; i < AudioPoint::COUNT; ++i) { _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]); right->Add (_type_checkbox[i], 0, wxEXPAND | wxALL, 3); - _type_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::type_clicked, this, _1)); + _type_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::type_clicked, this, _1)); } { @@ -87,7 +124,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) m->SetFont (subheading_font); right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); } - + _smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing); _smoothing->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&AudioDialog::smoothing_changed, this)); right->Add (_smoothing, 0, wxEXPAND); @@ -96,26 +133,26 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) overall_sizer->Add (lr_sizer); -#ifdef DCPOMATIC_LINUX +#ifdef DCPOMATIC_LINUX wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE); if (buttons) { overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } -#endif +#endif SetSizer (overall_sizer); overall_sizer->Layout (); overall_sizer->SetSizeHints (this); -} -void -AudioDialog::set_playlist (shared_ptr p) -{ - _playlist_connection.disconnect (); - _playlist = p; - _playlist_connection = _playlist->ContentChanged.connect (boost::bind (&AudioDialog::try_to_load_analysis, this)); - try_to_load_analysis (); + _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::content_changed, this, _2)); SetTitle (_("DCP-o-matic audio")); + + if (content) { + _playlist.reset (new Playlist ()); + const_pointer_cast (_playlist)->add (content); + } else { + _playlist = film->playlist (); + } } void @@ -128,40 +165,55 @@ AudioDialog::try_to_load_analysis () shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - boost::filesystem::path path = film->audio_analysis_path (_playlist); - + boost::filesystem::path const path = film->audio_analysis_path (_playlist); if (!boost::filesystem::exists (path)) { _plot->set_analysis (shared_ptr ()); _analysis.reset (); - shared_ptr job (new AnalyseAudioJob (film, _playlist)); - _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); - JobManager::instance()->add (job); + JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)); return; } try { _analysis.reset (new AudioAnalysis (path)); + } catch (OldFormatError& e) { + /* An old analysis file: recreate it */ + JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)); + return; } catch (xmlpp::exception& e) { - /* Probably an old-style analysis file: recreate it */ - shared_ptr job (new AnalyseAudioJob (film, _playlist)); - _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); - JobManager::instance()->add (job); + /* Probably a (very) old-style analysis file: recreate it */ + JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)); return; } - + _plot->set_analysis (_analysis); - setup_peak_time (); + _plot->set_gain_correction (_analysis->gain_correction (_playlist)); + setup_statistics (); /* Set up some defaults if no check boxes are checked */ - + int i = 0; - while (i < MAX_DCP_AUDIO_CHANNELS && (!_channel_checkbox[i] || !_channel_checkbox[i]->GetValue ())) { + while (i < _channels && (!_channel_checkbox[i] || !_channel_checkbox[i]->GetValue ())) { ++i; } - if (i == MAX_DCP_AUDIO_CHANNELS && _channel_checkbox[0]) { - _channel_checkbox[0]->SetValue (true); - _plot->set_channel_visible (0, true); + if (i == _channels) { + /* Nothing checked; check mapped ones */ + + list mapped; + shared_ptr content = _content.lock (); + + if (content) { + mapped = content->audio->mapping().mapped_output_channels (); + } else { + mapped = film->mapped_audio_channels (); + } + + BOOST_FOREACH (int i, mapped) { + if (_channel_checkbox[i]) { + _channel_checkbox[i]->SetValue (true); + _plot->set_channel_visible (i, true); + } + } } i = 0; @@ -183,8 +235,11 @@ void AudioDialog::analysis_finished () { shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - + if (!film) { + /* This should not happen, but if it does we should just give up quietly */ + return; + } + if (!boost::filesystem::exists (film->audio_analysis_path (_playlist))) { /* We analysed and still nothing showed up, so maybe it was cancelled or it failed. Give up. @@ -200,11 +255,11 @@ void AudioDialog::channel_clicked (wxCommandEvent& ev) { int c = 0; - while (c < MAX_DCP_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) { + while (c < _channels && ev.GetEventObject() != _channel_checkbox[c]) { ++c; } - DCPOMATIC_ASSERT (c < MAX_DCP_AUDIO_CHANNELS); + DCPOMATIC_ASSERT (c < _channels); _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ()); } @@ -212,8 +267,18 @@ AudioDialog::channel_clicked (wxCommandEvent& ev) void AudioDialog::content_changed (int p) { - if (p == AudioContentProperty::AUDIO_GAIN || p == AudioContentProperty::AUDIO_STREAMS) { + if (p == AudioContentProperty::STREAMS) { try_to_load_analysis (); + } else if (p == AudioContentProperty::GAIN) { + if (_playlist->content().size() == 1 && _analysis) { + /* We can use a short-cut to render the effect of this + change, rather than recalculating everything. + */ + _plot->set_gain_correction (_analysis->gain_correction (_playlist)); + setup_statistics (); + } else { + try_to_load_analysis (); + } } } @@ -237,30 +302,72 @@ AudioDialog::smoothing_changed () } void -AudioDialog::setup_peak_time () +AudioDialog::setup_statistics () { - if (!_analysis || !_analysis->peak ()) { + if (!_analysis) { return; } - + shared_ptr film = _film.lock (); if (!film) { return; } - - float peak_dB = 20 * log10 (_analysis->peak().get()); - - _peak_time->SetLabel ( + + pair const peak = _analysis->overall_sample_peak (); + float const peak_dB = 20 * log10 (peak.first.peak) + _analysis->gain_correction (_playlist); + _sample_peak->SetLabel ( wxString::Format ( - _("Peak is %.2fdB at %s"), + _("Sample peak is %.2fdB at %s on %s"), peak_dB, - time_to_timecode (_analysis->peak_time().get(), film->video_frame_rate ()).data () + time_to_timecode (peak.first.time, film->video_frame_rate ()).data (), + std_to_wx (short_audio_channel_name (peak.second)).data () ) ); - + if (peak_dB > -3) { - _peak_time->SetForegroundColour (wxColour (255, 0, 0)); + _sample_peak->SetForegroundColour (wxColour (255, 0, 0)); } else { - _peak_time->SetForegroundColour (wxColour (0, 0, 0)); + _sample_peak->SetForegroundColour (wxColour (0, 0, 0)); } + + if (_analysis->overall_true_peak()) { + float const peak = _analysis->overall_true_peak().get(); + float const peak_dB = 20 * log10 (peak) + _analysis->gain_correction (_playlist); + + _true_peak->SetLabel (wxString::Format (_("True peak is %.2fdB"), peak_dB)); + + if (peak_dB > -3) { + _true_peak->SetForegroundColour (wxColour (255, 0, 0)); + } else { + _true_peak->SetForegroundColour (wxColour (0, 0, 0)); + } + } + + /* XXX: check whether it's ok to add dB gain to these quantities */ + + if (static_cast(_analysis->integrated_loudness ())) { + _integrated_loudness->SetLabel ( + wxString::Format ( + _("Integrated loudness %.2f LUFS"), + _analysis->integrated_loudness().get() + _analysis->gain_correction (_playlist) + ) + ); + } + + if (static_cast(_analysis->loudness_range ())) { + _loudness_range->SetLabel ( + wxString::Format ( + _("Loudness range %.2f LU"), + _analysis->loudness_range().get() + _analysis->gain_correction (_playlist) + ) + ); + } +} + +bool +AudioDialog::Show (bool show) +{ + bool const r = wxDialog::Show (show); + try_to_load_analysis (); + return r; }