X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=b8c7f7b7343b23af4b08f62361d68dd6747606cd;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=48540077e5584d4514abdb3b956f0eceb6d4bbaf;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 48540077e..b8c7f7b73 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -21,6 +21,8 @@ #include "audio_dialog.h" #include "audio_plot.h" #include "wx_util.h" +#include "static_text.h" +#include "check_box.h" #include "lib/audio_analysis.h" #include "lib/film.h" #include "lib/analyse_audio_job.h" @@ -28,24 +30,28 @@ #include "lib/job_manager.h" #include #include -#include #include using std::cout; using std::list; using std::vector; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::bind; using boost::optional; using boost::const_pointer_cast; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; +using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif /** @param parent Parent window. * @param film Film we are using. * @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) +AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, weak_ptr viewer, shared_ptr content) : wxDialog ( parent, wxID_ANY, @@ -62,6 +68,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptraudio_channels ()) , _plot (0) @@ -74,42 +81,42 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrAdd (_cursor, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); - _plot = new AudioPlot (this); + _plot = new AudioPlot (this, viewer); left->Add (_plot, 1, wxTOP | wxEXPAND, 12); - _sample_peak = new wxStaticText (this, wxID_ANY, wxT ("")); + _sample_peak = new StaticText (this, wxT ("")); left->Add (_sample_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); - _true_peak = new wxStaticText (this, wxID_ANY, wxT ("")); + _true_peak = new StaticText (this, wxT ("")); left->Add (_true_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); - _integrated_loudness = new wxStaticText (this, wxID_ANY, wxT ("")); + _integrated_loudness = new StaticText (this, wxT ("")); left->Add (_integrated_loudness, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); - _loudness_range = new wxStaticText (this, wxID_ANY, wxT ("")); + _loudness_range = new StaticText (this, wxT ("")); left->Add (_loudness_range, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); + _leqm = new StaticText (this, wxT("")); + left->Add (_leqm, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); lr_sizer->Add (left, 1, wxALL | wxEXPAND, 12); wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); { - wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels")); + wxStaticText* m = new StaticText (this, _("Channels")); m->SetFont (subheading_font); right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16); } - for (int i = 0; i < _channels; ++i) { - _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i))); + for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) { + _channel_checkbox[i] = new CheckBox (this, std_to_wx(audio_channel_name(i))); _channel_checkbox[i]->SetForegroundColour(wxColour(_plot->colour(i))); right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3); _channel_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::channel_clicked, this, _1)); } - for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) { - _channel_checkbox[i] = 0; - } + show_or_hide_channel_checkboxes (); { - wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type")); + wxStaticText* m = new StaticText (this, _("Type")); m->SetFont (subheading_font); right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); } @@ -120,13 +127,13 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrAdd (_type_checkbox[i], 0, wxEXPAND | wxALL, 3); _type_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::type_clicked, this, _1)); } { - wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing")); + wxStaticText* m = new StaticText (this, _("Smoothing")); m->SetFont (subheading_font); right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16); } @@ -150,7 +157,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrLayout (); overall_sizer->SetSizeHints (this); - _film_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3)); + _film_connection = film->Change.connect (boost::bind(&AudioDialog::film_change, this, _1, _2)); + _film_content_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3)); DCPOMATIC_ASSERT (film->directory()); SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(film->directory().get().string()))); @@ -164,6 +172,20 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr film, shared_ptrCursor.connect (bind (&AudioDialog::set_cursor, this, _1, _2)); } + +void +AudioDialog::show_or_hide_channel_checkboxes () +{ + for (int i = 0; i < _channels; ++i) { + _channel_checkbox[i]->Show (); + } + + for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) { + _channel_checkbox[i]->Hide (); + } +} + + void AudioDialog::try_to_load_analysis () { @@ -180,6 +202,13 @@ AudioDialog::try_to_load_analysis () if (!boost::filesystem::exists (path)) { _plot->set_analysis (shared_ptr ()); _analysis.reset (); + + for (auto i: JobManager::instance()->get()) { + if (dynamic_pointer_cast(i)) { + i->cancel (); + } + } + JobManager::instance()->analyse_audio ( film, _playlist, !static_cast(check), _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this) ); @@ -205,6 +234,7 @@ AudioDialog::try_to_load_analysis () _plot->set_analysis (_analysis); _plot->set_gain_correction (_analysis->gain_correction (_playlist)); setup_statistics (); + show_or_hide_channel_checkboxes (); /* Set up some defaults if no check boxes are checked */ @@ -225,7 +255,7 @@ AudioDialog::try_to_load_analysis () mapped = film->mapped_audio_channels (); } - BOOST_FOREACH (int i, mapped) { + for (auto i: mapped) { if (_channel_checkbox[i]) { _channel_checkbox[i]->SetValue (true); _plot->set_channel_visible (i, true); @@ -281,10 +311,26 @@ AudioDialog::channel_clicked (wxCommandEvent& ev) _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ()); } +void +AudioDialog::film_change (ChangeType type, int p) +{ + if (type != ChangeType::DONE) { + return; + } + + if (p == Film::AUDIO_CHANNELS) { + auto film = _film.lock (); + if (film) { + _channels = film->audio_channels (); + try_to_load_analysis (); + } + } +} + void AudioDialog::content_change (ChangeType type, int p) { - if (type != CHANGE_TYPE_DONE) { + if (type != ChangeType::DONE) { return; } @@ -329,13 +375,13 @@ AudioDialog::setup_statistics () return; } - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } - pair const peak = _analysis->overall_sample_peak (); - float const peak_dB = 20 * log10 (peak.first.peak) + _analysis->gain_correction (_playlist); + auto const peak = _analysis->overall_sample_peak (); + float const peak_dB = linear_to_db(peak.first.peak) + _analysis->gain_correction(_playlist); _sample_peak->SetLabel ( wxString::Format ( _("Sample peak is %.2fdB at %s on %s"), @@ -353,7 +399,7 @@ AudioDialog::setup_statistics () if (_analysis->overall_true_peak()) { float const peak = _analysis->overall_true_peak().get(); - float const peak_dB = 20 * log10 (peak) + _analysis->gain_correction (_playlist); + float const peak_dB = linear_to_db(peak) + _analysis->gain_correction(_playlist); _true_peak->SetLabel (wxString::Format (_("True peak is %.2fdB"), peak_dB)); @@ -366,7 +412,7 @@ AudioDialog::setup_statistics () /* XXX: check whether it's ok to add dB gain to these quantities */ - if (static_cast(_analysis->integrated_loudness ())) { + if (static_cast(_analysis->integrated_loudness())) { _integrated_loudness->SetLabel ( wxString::Format ( _("Integrated loudness %.2f LUFS"), @@ -375,7 +421,7 @@ AudioDialog::setup_statistics () ); } - if (static_cast(_analysis->loudness_range ())) { + if (static_cast(_analysis->loudness_range())) { _loudness_range->SetLabel ( wxString::Format ( _("Loudness range %.2f LU"), @@ -383,6 +429,14 @@ AudioDialog::setup_statistics () ) ); } + + if (static_cast(_analysis->leqm())) { + _leqm->SetLabel( + wxString::Format( + _("LEQ(m) %.2fdB"), _analysis->leqm().get() + _analysis->gain_correction(_playlist) + ) + ); + } } bool @@ -401,7 +455,7 @@ AudioDialog::set_cursor (optional time, optional db) return; } - shared_ptr film = _film.lock(); + auto film = _film.lock(); DCPOMATIC_ASSERT (film); _cursor->SetLabel (wxString::Format (_("Cursor: %.1fdB at %s"), *db, time->timecode(film->video_frame_rate()))); }