Fix confusion between one-shot and playing causing surprising

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index f4de9cd1aac5b1ddc82f3738d48ac14fb0d68f72..f2377de43fefc07c3a273e95b348494a1e8e2839 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -38,16 +38,18 @@ using std::list;
 using std::vector;
 using std::pair;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** @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> film, shared_ptr<Content> content)
+AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer, shared_ptr<Content> content)
        : wxDialog (
                parent,
                wxID_ANY,
@@ -64,6 +66,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 #endif
                )
        , _film (film)
+       , _viewer (viewer)
        , _content (content)
        , _channels (film->audio_channels ())
        , _plot (0)
@@ -78,7 +81,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 
        _cursor = new StaticText (this, wxT("Cursor: none"));
        left->Add (_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 StaticText (this, wxT (""));
        left->Add (_sample_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
@@ -88,6 +91,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);
 
@@ -365,7 +370,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"),
@@ -383,7 +388,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));
 
@@ -413,6 +418,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