Move Film::make_kdms to the call sites.

[dcpomatic.git] / src / wx / audio_dialog.cc

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 9b3a9376937d4c4c94cf9ec601c4d9613055c48f..efc506aff9a62bdec61946882308950c84fb3259 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -89,6 +89,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
        left->Add (_integrated_loudness, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
        _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);
 
@@ -366,7 +368,7 @@ AudioDialog::setup_statistics ()
        }
 
        pair<AudioAnalysis::PeakTime, int> const peak = _analysis->overall_sample_peak ();
-       float const peak_dB = 20 * log10 (peak.first.peak) + _analysis->gain_correction (_playlist);
+       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"),
@@ -384,7 +386,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));
 
@@ -414,6 +416,14 @@ AudioDialog::setup_statistics ()
                                )
                        );
        }
+
+       if (static_cast<bool>(_analysis->leqm())) {
+               _leqm->SetLabel(
+                       wxString::Format(
+                               _("LEQ(m) %.2fdB"), _analysis->leqm().get() + _analysis->gain_correction(_playlist)
+                               )
+                       );
+       }
 }
 
 bool