X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=ebe8032581df5af7363f237d0010da1b6aae6722;hb=78a95b32af03460182abccc62c784e696cf53e17;hp=e1ea70ee31e3341cbc7d120f87add078c3c930f0;hpb=f07d5125a7b609320682689abe40781f096ca25e;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index e1ea70ee3..ebe803258 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -25,13 +25,19 @@ #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; +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) , _plot (0) @@ -41,7 +47,7 @@ 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); @@ -70,7 +76,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") @@ -87,7 +93,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,19 +102,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); - _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::try_to_load_analysis, 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 @@ -121,14 +134,11 @@ AudioDialog::try_to_load_analysis () shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - boost::filesystem::path path = film->audio_analysis_path (); - + 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)); - _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; } @@ -136,17 +146,16 @@ 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)); - _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); + _plot->set_gain_correction (_analysis->gain_correction (_playlist)); 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; @@ -177,8 +186,8 @@ AudioDialog::analysis_finished () { shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - - if (!boost::filesystem::exists (film->audio_analysis_path ())) { + + 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. */ @@ -205,8 +214,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) { + /* 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_peak_time (); + } else { + try_to_load_analysis (); + } } } @@ -235,14 +254,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()); - + + float const peak_dB = 20 * log10 (_analysis->peak().get()) + _analysis->gain_correction (_playlist); + _peak_time->SetLabel ( wxString::Format ( _("Peak is %.2fdB at %s"), @@ -250,7 +269,7 @@ 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 { @@ -265,5 +284,3 @@ AudioDialog::Show (bool show) try_to_load_analysis (); return r; } - -