Use libdcp's warnings.h

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

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 49f7e4ab3ad684b8ef0d791ead9d2cff13cec422..b2ffd5ad52467aaf5f7ad6d63551bcdd2f95be20 100644 (file)
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,24 @@
 
 */
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <wx/wx.h>
 #include "lib/util.h"
 #include "lib/audio_analysis.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_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);
@@ -40,16 +44,41 @@ public:
 
        wxColour colour (int n) const;
 
+       boost::signals2::signal<void (boost::optional<dcpomatic::DCPTime>, boost::optional<float>)> Cursor;
+
        static const int max_smoothing;
 
 private:
+
+       struct Point {
+               Point ()
+                       : db(0)
+               {}
+
+               Point (wxPoint draw_, dcpomatic::DCPTime time_, float db_)
+                       : draw(draw_)
+                       , time(time_)
+                       , db(db_)
+               {}
+
+               wxPoint draw;
+               dcpomatic::DCPTime time;
+               float db;
+       };
+
+       typedef std::vector<Point> PointList;
+
        void paint ();
        void plot_peak (wxGraphicsPath &, int, Metrics const &) const;
        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);
 
-       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;
@@ -57,5 +86,13 @@ private:
        wxString _message;
        float _gain_correction;
 
+       /** peak values keyed by channel */
+       mutable std::map<int, PointList> _peak;
+       /** RMS values keyed by channel */
+       mutable std::map<int, PointList> _rms;
+
+       boost::optional<Point> _cursor;
+
        static const int _minimum;
+       static const int _cursor_size;
 };