X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=c2afb53dc77f454cee2df277663ba008fdbaa5b9;hb=d75e4c652fac5d3c65b42b03249f3c6e0836f772;hp=32864ca15974a9c400bb88da7c27efcbc75a17a0;hpb=ab624eaed4423b1813148e1c395092697b541139;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 32864ca15..c2afb53dc 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 @@ -19,74 +19,250 @@ #include "audio_dialog.h" #include "audio_plot.h" -#include "audio_analysis.h" -#include "film.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 using boost::shared_ptr; +using boost::bind; +using boost::optional; -AudioDialog::AudioDialog (wxWindow* parent, boost::shared_ptr film) - : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) +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) + , _film (film) , _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); + left->Add (_plot, 1, wxALL | wxEXPAND, 12); + _peak_time = new wxStaticText (this, wxID_ANY, wxT ("")); + left->Add (_peak_time, 0, wxALL, 12); - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); + lr_sizer->Add (left, 1, wxALL, 12); - add_label_to_sizer (table, this, _("Channel")); - _channel = new wxChoice (this, wxID_ANY); - table->Add (_channel, 1, wxEXPAND | wxALL, 6); + wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); - sizer->Add (table); + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels")); + m->SetFont (subheading_font); + right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16); + } - set_film (film); + for (int i = 0; i < MAX_DCP_AUDIO_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)); + } - SetSizer (sizer); - sizer->Layout (); - sizer->SetSizeHints (this); + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type")); + m->SetFont (subheading_font); + right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); + } + + wxString const types[] = { + _("Peak"), + _("RMS") + }; + + 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)); + } - _channel->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (AudioDialog::channel_changed), 0, this); + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing")); + 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); + + lr_sizer->Add (right, 0, wxALL, 12); + + overall_sizer->Add (lr_sizer); + +#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::try_to_load_analysis, this)); + SetTitle (_("DCP-o-matic audio")); } void -AudioDialog::set_film (boost::shared_ptr f) +AudioDialog::try_to_load_analysis () { - _film_connection.disconnect (); - _film = f; - - shared_ptr a; + if (!IsShown ()) { + return; + } + + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + + boost::filesystem::path path = film->audio_analysis_path (); + + if (!boost::filesystem::exists (path)) { + _plot->set_analysis (shared_ptr ()); + _analysis.reset (); + shared_ptr job (new AnalyseAudioJob (film)); + _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); + JobManager::instance()->add (job); + return; + } try { - a.reset (new AudioAnalysis (f->audio_analysis_path ())); - } catch (...) { + _analysis.reset (new AudioAnalysis (path)); + } catch (xmlpp::exception& e) { + /* Probably an old-style analysis file: recreate it */ + shared_ptr job (new AnalyseAudioJob (film)); + _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); + JobManager::instance()->add (job); + return; + } + + _plot->set_analysis (_analysis); + setup_peak_time (); + + /* 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 ())) { + ++i; + } + if (i == MAX_DCP_AUDIO_CHANNELS && _channel_checkbox[0]) { + _channel_checkbox[0]->SetValue (true); + _plot->set_channel_visible (0, true); } - - _plot->set_analysis (a); - _channel->Clear (); - for (int i = 0; i < f->audio_stream()->channels(); ++i) { - _channel->Append (audio_channel_name (i)); + i = 0; + while (i < AudioPoint::COUNT && !_type_checkbox[i]->GetValue ()) { + i++; } - _channel->SetSelection (0); + if (i == AudioPoint::COUNT) { + for (int i = 0; i < AudioPoint::COUNT; ++i) { + _type_checkbox[i]->SetValue (true); + _plot->set_type_visible (i, true); + } + } - _film_connection = f->Changed.connect (bind (&AudioDialog::film_changed, this, _1)); + Refresh (); } void -AudioDialog::channel_changed (wxCommandEvent &) +AudioDialog::analysis_finished () { - _plot->set_channel (_channel->GetSelection ()); + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + + if (!boost::filesystem::exists (film->audio_analysis_path ())) { + /* 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::film_changed (Film::Property p) +AudioDialog::channel_clicked (wxCommandEvent& ev) { - if (p == Film::AUDIO_GAIN) { - _plot->set_gain (_film->audio_gain ()); + int c = 0; + while (c < MAX_DCP_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) { + ++c; } + + DCPOMATIC_ASSERT (c < MAX_DCP_AUDIO_CHANNELS); + + _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ()); } + +void +AudioDialog::content_changed (int p) +{ + if (p == AudioContentProperty::AUDIO_GAIN || p == AudioContentProperty::AUDIO_STREAMS) { + try_to_load_analysis (); + } +} + +void +AudioDialog::type_clicked (wxCommandEvent& ev) +{ + int t = 0; + while (t < AudioPoint::COUNT && ev.GetEventObject() != _type_checkbox[t]) { + ++t; + } + + DCPOMATIC_ASSERT (t < AudioPoint::COUNT); + + _plot->set_type_visible (t, _type_checkbox[t]->GetValue ()); +} + +void +AudioDialog::smoothing_changed () +{ + _plot->set_smoothing (_smoothing->GetValue ()); +} + +void +AudioDialog::setup_peak_time () +{ + if (!_analysis || !_analysis->peak ()) { + 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)); + } +} + +void +AudioDialog::Show () +{ + wxDialog::Show (); + try_to_load_analysis (); +} + +