X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=fd523aa02057680f205564a4cac08659d6cac9f1;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=1ce0f38a8c9b0e5d71411c740db8ef5ed29b6d9c;hpb=fc96a4b3d6985f28db6bc0e9418e98cc5bec87e3;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 1ce0f38a8..fd523aa02 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -17,13 +17,15 @@ */ -#include -#include "lib/audio_analysis.h" -#include "lib/film.h" -#include "lib/audio_content.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 using boost::shared_ptr; using boost::bind; @@ -37,8 +39,9 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) 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); @@ -46,7 +49,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film) _peak_time = new wxStaticText (this, wxID_ANY, wxT ("")); left->Add (_peak_time, 0, wxALL, 12); - sizer->Add (left, 1, wxALL, 12); + lr_sizer->Add (left, 1, wxALL, 12); wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); @@ -67,7 +70,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") @@ -84,31 +87,28 @@ 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_content (shared_ptr c) -{ - _content_changed_connection.disconnect (); - - _content = c; - - try_to_load_analysis (); - _plot->set_gain (_content->audio_gain ()); +#ifdef DCPOMATIC_LINUX + wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE); + if (buttons) { + overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); + } +#endif - _content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2)); + SetSizer (overall_sizer); + overall_sizer->Layout (); + overall_sizer->SetSizeHints (this); - SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->path_summary()).data())); + _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::try_to_load_analysis, this)); + SetTitle (_("DCP-o-matic audio")); } void @@ -118,19 +118,35 @@ AudioDialog::try_to_load_analysis () return; } - if (!boost::filesystem::exists (_content->audio_analysis_path())) { + 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 (); - _analysis_finished_connection = _content->analyse_audio (bind (&AudioDialog::analysis_finished, this)); + shared_ptr job (new AnalyseAudioJob (film)); + _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); + JobManager::instance()->add (job); return; } - - _analysis.reset (new AudioAnalysis (_content->audio_analysis_path ())); + + try { + _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; @@ -152,12 +168,17 @@ AudioDialog::try_to_load_analysis () _plot->set_type_visible (i, true); } } + + Refresh (); } void AudioDialog::analysis_finished () { - if (!boost::filesystem::exists (_content->audio_analysis_path())) { + 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. */ @@ -184,10 +205,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev) void AudioDialog::content_changed (int p) { - if (p == AudioContentProperty::AUDIO_GAIN) { - _plot->set_gain (_content->audio_gain ()); - setup_peak_time (); - } else if (p == AudioContentProperty::AUDIO_MAPPING) { + if (p == AudioContentProperty::AUDIO_GAIN || p == AudioContentProperty::AUDIO_STREAMS) { try_to_load_analysis (); } } @@ -217,14 +235,14 @@ 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()) + _content->audio_gain(); - + + float peak_dB = 20 * log10 (_analysis->peak().get()); + _peak_time->SetLabel ( wxString::Format ( _("Peak is %.2fdB at %s"), @@ -232,10 +250,20 @@ AudioDialog::setup_peak_time () 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)); } } + +bool +AudioDialog::Show (bool show) +{ + bool const r = wxDialog::Show (show); + try_to_load_analysis (); + return r; +} + +