X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=e9dee3dacfe7fa96c37a601c653eb8a3e8796817;hb=419afb743ad2aaf1ea301356ac09f9a26ee15567;hp=0034e793d020934b7e3c9e5e31f9c88a01625fe3;hpb=f98caf4af896e9be943046b84586da5c2e103f18;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 0034e793d..e9dee3dac 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -23,32 +23,46 @@ #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 +using std::cout; using boost::shared_ptr; using boost::bind; using boost::optional; +using boost::const_pointer_cast; +using boost::dynamic_pointer_cast; -AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) +/** @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) { wxFont subheading_font (*wxNORMAL_FONT); subheading_font.SetWeight (wxFONTWEIGHT_BOLD); - wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL); - + 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); - - sizer->Add (left, 1, 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); wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); @@ -58,7 +72,7 @@ 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)); @@ -69,7 +83,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") @@ -86,26 +100,35 @@ 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); - sizer->Add (right, 0, wxALL, 12); + lr_sizer->Add (right, 0, wxALL, 12); - SetSizer (sizer); - sizer->Layout (); - sizer->SetSizeHints (this); -} + overall_sizer->Add (lr_sizer); -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 (); +#ifdef DCPOMATIC_LINUX + wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE); + if (buttons) { + overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); + } +#endif + + SetSizer (overall_sizer); + overall_sizer->Layout (); + overall_sizer->SetSizeHints (this); + + _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 @@ -118,14 +141,11 @@ 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; } @@ -133,23 +153,22 @@ AudioDialog::try_to_load_analysis () _analysis.reset (new AudioAnalysis (path)); } 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); + 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]) { + if (i == _channels && _channel_checkbox[0]) { _channel_checkbox[0]->SetValue (true); _plot->set_channel_visible (0, true); } @@ -174,7 +193,7 @@ 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. @@ -190,11 +209,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 ()); } @@ -202,8 +221,18 @@ AudioDialog::channel_clicked (wxCommandEvent& ev) void AudioDialog::content_changed (int p) { - if (p == AudioContentProperty::AUDIO_GAIN || p == AudioContentProperty::AUDIO_STREAMS) { + 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 (); + } } } @@ -227,30 +256,61 @@ 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 ( - wxString::Format ( - _("Peak is %.2fdB at %s"), - peak_dB, - time_to_timecode (_analysis->peak_time().get(), film->video_frame_rate ()).data () - ) - ); - - if (peak_dB > -3) { - _peak_time->SetForegroundColour (wxColour (255, 0, 0)); - } else { - _peak_time->SetForegroundColour (wxColour (0, 0, 0)); + + 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; }