std::shared_ptr

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

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 85306a58d4ee45acf2e210775f9100a094178e87..27d76b6db3ce1fb235a5df7b1253e41b5d7583e3 100644 (file)
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,19 +20,22 @@
 
 #include "lib/util.h"
 #include "lib/audio_analysis.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <vector>
 
 struct Metrics;
+class FilmViewer;
 
 class AudioPlot : public wxPanel
 {
 public:
-       explicit AudioPlot (wxWindow *);
+       explicit AudioPlot (wxWindow *, std::weak_ptr<FilmViewer> viewer);
 
-       void set_analysis (boost::shared_ptr<AudioAnalysis>);
+       void set_analysis (std::shared_ptr<AudioAnalysis>);
        void set_channel_visible (int c, bool v);
        void set_type_visible (int t, bool v);
        void set_smoothing (int);
@@ -41,7 +44,7 @@ public:
 
        wxColour colour (int n) const;
 
-       boost::signals2::signal<void (boost::optional<DCPTime>, boost::optional<float>)> Cursor;
+       boost::signals2::signal<void (boost::optional<dcpomatic::DCPTime>, boost::optional<float>)> Cursor;
 
        static const int max_smoothing;
 
@@ -52,14 +55,14 @@ private:
                        : db(0)
                {}
 
-               Point (wxPoint draw_, DCPTime time_, float db_)
+               Point (wxPoint draw_, dcpomatic::DCPTime time_, float db_)
                        : draw(draw_)
                        , time(time_)
                        , db(db_)
                {}
 
                wxPoint draw;
-               DCPTime time;
+               dcpomatic::DCPTime time;
                float db;
        };
 
@@ -70,11 +73,13 @@ private:
        void plot_rms (wxGraphicsPath &, int, Metrics const &) const;
        float y_for_linear (float, Metrics const &) const;
        AudioPoint get_point (int channel, int point) const;
+       void left_down ();
        void mouse_moved (wxMouseEvent& ev);
        void mouse_leave (wxMouseEvent& ev);
        void search (std::map<int, PointList> const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const;
 
-       boost::shared_ptr<AudioAnalysis> _analysis;
+       std::weak_ptr<FilmViewer> _viewer;
+       std::shared_ptr<AudioAnalysis> _analysis;
        bool _channel_visible[MAX_DCP_AUDIO_CHANNELS];
        bool _type_visible[AudioPoint::COUNT];
        int _smoothing;