X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.h;h=27d76b6db3ce1fb235a5df7b1253e41b5d7583e3;hp=203d7af8befcdfc2dd9255849cf4efb84fdab1a3;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=37c28f4c76df89bc84d773beda1bb90be1cedd1a

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 203d7af8b..27d76b6db 100644
--- 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 "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+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);
@@ -40,39 +44,54 @@ public:
 
 	wxColour colour (int n) const;
 
+	boost::signals2::signal<void (boost::optional<dcpomatic::DCPTime>, boost::optional<float>)> Cursor;
+
 	static const int max_smoothing;
 
 private:
-	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;
-
-	boost::shared_ptr<AudioAnalysis> _analysis;
-	bool _channel_visible[MAX_DCP_AUDIO_CHANNELS];
-	bool _type_visible[AudioPoint::COUNT];
-	int _smoothing;
-	std::vector<wxColour> _colours;
-	wxString _message;
-	float _gain_correction;
 
 	struct Point {
-		Point (wxPoint draw_, DCPTime time_, float db_)
+		Point ()
+			: db(0)
+		{}
+
+		Point (wxPoint draw_, dcpomatic::DCPTime time_, float db_)
 			: draw(draw_)
 			, time(time_)
 			, db(db_)
 		{}
 
 		wxPoint draw;
-		DCPTime time;
+		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);
+	void search (std::map<int, PointList> const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const;
+
+	std::weak_ptr<FilmViewer> _viewer;
+	std::shared_ptr<AudioAnalysis> _analysis;
+	bool _channel_visible[MAX_DCP_AUDIO_CHANNELS];
+	bool _type_visible[AudioPoint::COUNT];
+	int _smoothing;
+	std::vector<wxColour> _colours;
+	wxString _message;
+	float _gain_correction;
+
 	mutable std::map<int, PointList> _peak;
 	mutable std::map<int, PointList> _rms;
 
+	boost::optional<Point> _cursor;
+
 	static const int _minimum;
+	static const int _cursor_size;
 };