X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=d4108f89c32aeffadf6136320c1d14693227c999;hb=d2bd0c628fd0616fe3b7dd02bd955b2c07ab48d5;hp=fcae9c30f9f85835adb0b3833d785cb5ec0cd4f7;hpb=65274489101d5b5c503ea94d61d7ac5eb1372636;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index fcae9c30f..d4108f89c 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -17,19 +17,26 @@ */ -#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 +#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) @@ -37,8 +44,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 +54,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 +75,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 +92,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); - - SetSizer (sizer); - sizer->Layout (); - sizer->SetSizeHints (this); -} + lr_sizer->Add (right, 0, wxALL, 12); -void -AudioDialog::set_content (shared_ptr c) -{ - _content_changed_connection.disconnect (); + overall_sizer->Add (lr_sizer); - _content = c; +#ifdef DCPOMATIC_LINUX + wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE); + if (buttons) { + overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); + } +#endif - try_to_load_analysis (); - _plot->set_gain (_content->audio_gain ()); + SetSizer (overall_sizer); + overall_sizer->Layout (); + overall_sizer->SetSizeHints (this); - _content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2)); + _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(_content->path_summary()).data())); + if (content) { + _playlist.reset (new Playlist ()); + const_pointer_cast (_playlist)->add (content); + } else { + _playlist = film->playlist (); + } } void @@ -118,26 +130,31 @@ 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 const path = film->audio_analysis_path (_playlist); + if (!boost::filesystem::exists (path)) { _plot->set_analysis (shared_ptr ()); _analysis.reset (); - _analysis_finished_connection = _content->analyse_audio (bind (&AudioDialog::analysis_finished, this)); + JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)); return; } try { - _analysis.reset (new AudioAnalysis (_content->audio_analysis_path ())); + _analysis.reset (new AudioAnalysis (path)); } catch (xmlpp::exception& e) { /* Probably an old-style analysis file: recreate it */ - _analysis_finished_connection = _content->analyse_audio (bind (&AudioDialog::analysis_finished, this)); + JobManager::instance()->analyse_audio (film, _playlist, _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)); return; } - + _plot->set_analysis (_analysis); + _plot->set_gain_correction (gain_correction ()); 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; @@ -166,7 +183,10 @@ AudioDialog::try_to_load_analysis () 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 (_playlist))) { /* We analysed and still nothing showed up, so maybe it was cancelled or it failed. Give up. */ @@ -193,11 +213,18 @@ 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_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 (gain_correction ()); + setup_peak_time (); + } else { + try_to_load_analysis (); + } } } @@ -226,14 +253,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 const peak_dB = 20 * log10 (_analysis->peak().get()) + gain_correction (); + _peak_time->SetLabel ( wxString::Format ( _("Peak is %.2fdB at %s"), @@ -241,10 +268,37 @@ 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; +} + +/** @return gain correction in dB required to be added to raw gain values to render + * the dialog correctly. + */ +float +AudioDialog::gain_correction () +{ + if (_playlist->content().size() == 1 && _analysis->analysis_gain ()) { + /* In this case we know that the analysis was of a single piece of content and + we know that content's gain when the analysis was run. Hence we can work out + what correction is now needed to make it look `right'. + */ + shared_ptr ac = dynamic_pointer_cast (_playlist->content().front ()); + DCPOMATIC_ASSERT (ac); + return ac->audio_gain() - _analysis->analysis_gain().get (); + } + + return 0.0f; +}