X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=e9dee3dacfe7fa96c37a601c653eb8a3e8796817;hb=419afb743ad2aaf1ea301356ac09f9a26ee15567;hp=15d746839bc6b18ae241ebc62b45b82e21a885bf;hpb=28dbf4fd074d2046a3c8ddebac9a537a80fd457a;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 15d746839..e9dee3dac 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,44 +17,73 @@ */ -#include -#include "lib/audio_analysis.h" -#include "lib/film.h" #include "audio_dialog.h" #include "audio_plot.h" #include "wx_util.h" +#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 +#include +#include +using std::cout; using boost::shared_ptr; using boost::bind; using boost::optional; - -AudioDialog::AudioDialog (wxWindow* parent) - : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) +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), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) + , _film (film) + , _channels (film->audio_channels ()) , _plot (0) { - wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL); + wxFont subheading_font (*wxNORMAL_FONT); + subheading_font.SetWeight (wxFONTWEIGHT_BOLD); + + wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + wxBoxSizer* lr_sizer = new wxBoxSizer (wxHORIZONTAL); + + wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); _plot = new AudioPlot (this); - sizer->Add (_plot, 1, wxALL | wxEXPAND, 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); - wxBoxSizer* side = new wxBoxSizer (wxVERTICAL); + lr_sizer->Add (left, 1, wxALL, 12); + + wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); { wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels")); - side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + m->SetFont (subheading_font); + right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16); } - for (int i = 0; i < MAX_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))); - side->Add (_channel_checkbox[i], 1, wxEXPAND | wxALL, 3); - _channel_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::channel_clicked), 0, this); + right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3); + _channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1)); } { wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type")); - side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + m->SetFont (subheading_font); + right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); } - + wxString const types[] = { _("Peak"), _("RMS") @@ -62,96 +91,148 @@ AudioDialog::AudioDialog (wxWindow* parent) for (int i = 0; i < AudioPoint::COUNT; ++i) { _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]); - side->Add (_type_checkbox[i], 1, wxEXPAND | wxALL, 3); - _type_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::type_clicked), 0, this); + right->Add (_type_checkbox[i], 0, wxEXPAND | wxALL, 3); + _type_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::type_clicked, this, _1)); } { wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing")); - side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + 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->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (AudioDialog::smoothing_changed), 0, this); - side->Add (_smoothing, 1, wxEXPAND); - sizer->Add (side, 0, wxALL, 12); + _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); - SetSizer (sizer); - sizer->Layout (); - sizer->SetSizeHints (this); -} + lr_sizer->Add (right, 0, wxALL, 12); -void -AudioDialog::set_film (shared_ptr f) -{ - _film_changed_connection.disconnect (); - _film_audio_analysis_succeeded_connection.disconnect (); - - _film = f; + overall_sizer->Add (lr_sizer); - for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { - _channel_checkbox[i]->Show (!_film->audio_mapping().dcp_to_content (static_cast (i)).empty()); +#ifdef DCPOMATIC_LINUX + wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE); + if (buttons) { + overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } +#endif - try_to_load_analysis (); - _plot->set_gain (_film->audio_gain ()); + SetSizer (overall_sizer); + overall_sizer->Layout (); + overall_sizer->SetSizeHints (this); - _film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1)); - _film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this)); + _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::content_changed, this, _2)); + SetTitle (_("DCP-o-matic audio")); - SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_film->name()).data())); + if (content) { + _playlist.reset (new Playlist ()); + const_pointer_cast (_playlist)->add (content); + } else { + _playlist = film->playlist (); + } } - void AudioDialog::try_to_load_analysis () { - shared_ptr a; + if (!IsShown ()) { + return; + } - if (boost::filesystem::exists (_film->audio_analysis_path())) { - a.reset (new AudioAnalysis (_film->audio_analysis_path ())); - } else { - if (IsShown ()) { - _film->analyse_audio (); - } + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + + boost::filesystem::path const path = film->audio_analysis_path (_playlist); + if (!boost::filesystem::exists (path)) { + _plot->set_analysis (shared_ptr ()); + _analysis.reset (); + JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)); + return; } - - _plot->set_analysis (a); - if (_channel_checkbox[0]) { + try { + _analysis.reset (new AudioAnalysis (path)); + } catch (xmlpp::exception& e) { + /* Probably an 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); + _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 < _channels && (!_channel_checkbox[i] || !_channel_checkbox[i]->GetValue ())) { + ++i; + } + + if (i == _channels && _channel_checkbox[0]) { _channel_checkbox[0]->SetValue (true); + _plot->set_channel_visible (0, true); } - _plot->set_channel_visible (0, true); - for (int i = 0; i < AudioPoint::COUNT; ++i) { - _type_checkbox[i]->SetValue (true); - _plot->set_type_visible (i, true); + i = 0; + while (i < AudioPoint::COUNT && !_type_checkbox[i]->GetValue ()) { + i++; + } + + if (i == AudioPoint::COUNT) { + for (int i = 0; i < AudioPoint::COUNT; ++i) { + _type_checkbox[i]->SetValue (true); + _plot->set_type_visible (i, true); + } + } + + Refresh (); +} + +void +AudioDialog::analysis_finished () +{ + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + + 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. + */ + _plot->set_message (_("Could not analyse audio.")); + return; } + + try_to_load_analysis (); } void AudioDialog::channel_clicked (wxCommandEvent& ev) { int c = 0; - while (c < MAX_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) { + while (c < _channels && ev.GetEventObject() != _channel_checkbox[c]) { ++c; } - assert (c < MAX_AUDIO_CHANNELS); + DCPOMATIC_ASSERT (c < _channels); _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ()); } void -AudioDialog::film_changed (Film::Property p) +AudioDialog::content_changed (int p) { - switch (p) { - case Film::AUDIO_GAIN: - _plot->set_gain (_film->audio_gain ()); - break; - default: - break; + if (p == AudioContentProperty::AUDIO_STREAMS) { + try_to_load_analysis (); + } else if (p == AudioContentProperty::AUDIO_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 (); + } } } @@ -163,13 +244,73 @@ AudioDialog::type_clicked (wxCommandEvent& ev) ++t; } - assert (t < AudioPoint::COUNT); + DCPOMATIC_ASSERT (t < AudioPoint::COUNT); _plot->set_type_visible (t, _type_checkbox[t]->GetValue ()); } void -AudioDialog::smoothing_changed (wxScrollEvent &) +AudioDialog::smoothing_changed () { _plot->set_smoothing (_smoothing->GetValue ()); } + +void +AudioDialog::setup_statistics () +{ + if (!_analysis) { + return; + } + + shared_ptr film = _film.lock (); + if (!film) { + return; + } + + if (static_cast(_analysis->sample_peak ())) { + + float const peak_dB = 20 * log10 (_analysis->sample_peak().get()) + _analysis->gain_correction (_playlist); + + _sample_peak->SetLabel ( + wxString::Format ( + _("Sample peak is %.2fdB at %s"), + peak_dB, + time_to_timecode (_analysis->sample_peak_time().get(), film->video_frame_rate ()).data () + ) + ); + + if (peak_dB > -3) { + _sample_peak->SetForegroundColour (wxColour (255, 0, 0)); + } else { + _sample_peak->SetForegroundColour (wxColour (0, 0, 0)); + } + } + + if (static_cast(_analysis->true_peak ())) { + float const peak_dB = 20 * log10 (_analysis->true_peak().get()) + _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)); + } + } + + if (static_cast(_analysis->integrated_loudness ())) { + _integrated_loudness->SetLabel (wxString::Format (_("Integrated loudness %.2f LUFS"), _analysis->integrated_loudness().get())); + } + + if (static_cast(_analysis->loudness_range ())) { + _loudness_range->SetLabel (wxString::Format (_("Loudness range %.2f LRA"), _analysis->loudness_range().get())); + } +} + +bool +AudioDialog::Show (bool show) +{ + bool const r = wxDialog::Show (show); + try_to_load_analysis (); + return r; +}