BOOST_FOREACH.

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

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 3da7a50ff2c57dfe515e8a0c16c7c66d816d3dcd..cb10908df821b432dc68692b51c9e1e67fdcc283 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,12 +19,13 @@
 */
 
 #include "audio_plot.h"
+#include "wx_util.h"
+#include "film_viewer.h"
 #include "lib/audio_decoder.h"
 #include "lib/audio_analysis.h"
 #include "lib/compose.hpp"
-#include "wx/wx_util.h"
 #include <wx/graphics.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <iostream>
 #include <cfloat>
 
@@ -36,15 +37,20 @@ using std::min;
 using std::map;
 using boost::bind;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 int const AudioPlot::_minimum = -70;
 int const AudioPlot::_cursor_size = 8;
 int const AudioPlot::max_smoothing = 128;
 
-AudioPlot::AudioPlot (wxWindow* parent)
+AudioPlot::AudioPlot (wxWindow* parent, weak_ptr<FilmViewer> viewer)
        : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
+       , _viewer (viewer)
        , _smoothing (max_smoothing / 2)
        , _gain_correction (0)
 {
@@ -87,6 +93,7 @@ AudioPlot::AudioPlot (wxWindow* parent)
        Bind (wxEVT_PAINT, boost::bind (&AudioPlot::paint, this));
        Bind (wxEVT_MOTION, boost::bind (&AudioPlot::mouse_moved, this, _1));
        Bind (wxEVT_LEAVE_WINDOW, boost::bind (&AudioPlot::mouse_leave, this, _1));
+       Bind (wxEVT_LEFT_DOWN, boost::bind(&AudioPlot::left_down, this));
 
        SetMinSize (wxSize (640, 512));
 }
@@ -146,6 +153,7 @@ AudioPlot::paint ()
        if (!_analysis || _analysis->channels() == 0) {
                gc->SetFont (gc->CreateFont (*wxNORMAL_FONT));
                gc->DrawText (_message, 32, 32);
+               delete gc;
                return;
        }
 
@@ -267,7 +275,7 @@ AudioPlot::y_for_linear (float p, Metrics const & metrics) const
                p = 1e-4;
        }
 
-       return metrics.height - (20 * log10(p) - _minimum) * metrics.y_scale - metrics.y_origin;
+       return metrics.height - (linear_to_db(p) - _minimum) * metrics.y_scale - metrics.y_origin;
 }
 
 void
@@ -294,7 +302,7 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics
                        Point (
                                wxPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (peak, metrics)),
                                DCPTime::from_frames (i * _analysis->samples_per_point(), _analysis->sample_rate()),
-                               20 * log10(peak)
+                               linear_to_db(peak)
                                )
                        );
        }
@@ -302,7 +310,7 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics
        DCPOMATIC_ASSERT (_peak.find(channel) != _peak.end());
 
        path.MoveToPoint (_peak[channel][0].draw);
-       BOOST_FOREACH (Point const & i, _peak[channel]) {
+       for (auto const& i: _peak[channel]) {
                path.AddLineToPoint (i.draw);
        }
 }
@@ -363,7 +371,7 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics)
                        Point (
                                wxPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (p, metrics)),
                                DCPTime::from_frames (i * _analysis->samples_per_point(), _analysis->sample_rate()),
-                               20 * log10(p)
+                               linear_to_db(p)
                                )
                        );
        }
@@ -371,7 +379,7 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics)
        DCPOMATIC_ASSERT (_rms.find(channel) != _rms.end());
 
        path.MoveToPoint (_rms[channel][0].draw);
-       BOOST_FOREACH (Point const & i, _rms[channel]) {
+       for (auto const& i: _rms[channel]) {
                path.AddLineToPoint (i.draw);
        }
 }
@@ -397,7 +405,7 @@ AudioPlot::get_point (int channel, int point) const
 {
        AudioPoint p = _analysis->get_point (channel, point);
        for (int i = 0; i < AudioPoint::COUNT; ++i) {
-               p[i] *= pow (10, _gain_correction / 20);
+               p[i] *= db_to_linear(_gain_correction);
        }
 
        return p;
@@ -417,7 +425,7 @@ void
 AudioPlot::search (map<int, PointList> const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const
 {
        for (map<int, PointList>::const_iterator i = search.begin(); i != search.end(); ++i) {
-               BOOST_FOREACH (Point const & j, i->second) {
+               for (auto const& j: i->second) {
                        double const dist = pow(ev.GetX() - j.draw.x, 2) + pow(ev.GetY() - j.draw.y, 2);
                        if (dist < min_dist) {
                                min_dist = dist;
@@ -427,6 +435,19 @@ AudioPlot::search (map<int, PointList> const & search, wxMouseEvent const & ev,
        }
 }
 
+
+void
+AudioPlot::left_down ()
+{
+       if (_cursor) {
+               shared_ptr<FilmViewer> fv = _viewer.lock ();
+               if (fv) {
+                       fv->seek (_cursor->time, true);
+               }
+       }
+}
+
+
 void
 AudioPlot::mouse_moved (wxMouseEvent& ev)
 {