X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.h;h=edb444a2ab9047ed75b7021d7d5df2ebdea6129d;hb=c536ea4b470fffadcc491b2b9885e027efa2ec5c;hp=49f7e4ab3ad684b8ef0d791ead9d2cff13cec422;hpb=a69d242f3f00207d6ea7320e6723775f4b0dbfb3;p=dcpomatic.git

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 49f7e4ab3..edb444a2a 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-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,12 @@
 
 */
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <wx/wx.h>
 #include "lib/util.h"
 #include "lib/audio_analysis.h"
+#include <wx/wx.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+#include <vector>
 
 struct Metrics;
 
@@ -40,14 +41,38 @@ 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 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;
 	bool _channel_visible[MAX_DCP_AUDIO_CHANNELS];
@@ -57,5 +82,11 @@ private:
 	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;
 };