X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_plot.h;h=f482da8f8a2d75cb2876071abbfcf5aed0c11519;hb=HEAD;hp=440be32e23ee6070b2680f77a29635652164797f;hpb=a978f3ac575f1af017002c861480d5203cf0a34e;p=dcpomatic.git

diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h
index 440be32e2..f482da8f8 100644
--- a/src/wx/video_waveform_plot.h
+++ b/src/wx/video_waveform_plot.h
@@ -1,58 +1,75 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
+
 namespace dcp {
 	class OpenJPEGImage;
 }
 
 class PlayerVideo;
 class Image;
+class Film;
 class FilmViewer;
 
+
 class VideoWaveformPlot : public wxPanel
 {
 public:
-	VideoWaveformPlot (wxWindow* parent, FilmViewer* viewer);
+	VideoWaveformPlot(wxWindow* parent, std::weak_ptr<const Film> film, FilmViewer& viewer);
 
 	void set_enabled (bool e);
 	void set_component (int c);
 	void set_contrast (int b);
 
+	/** Emitted when the mouse is moved over the waveform.  The parameters
+	    are:
+	    - (int, int): image x range
+	    - (int, int): component value range
+	*/
+	boost::signals2::signal<void (int, int, int, int)> MouseMoved;
+
 private:
 	void paint ();
 	void sized (wxSizeEvent &);
 	void create_waveform ();
-	void set_image (boost::weak_ptr<PlayerVideo>);
+	void set_image (std::shared_ptr<PlayerVideo>);
+	void mouse_moved (wxMouseEvent &);
 
-	boost::shared_ptr<dcp::OpenJPEGImage> _image;
-	boost::shared_ptr<const Image> _waveform;
-	bool _dirty;
-	bool _enabled;
-	int _component;
-	int _contrast;
+	std::weak_ptr<const Film> _film;
+	std::shared_ptr<dcp::OpenJPEGImage> _image;
+	std::shared_ptr<const Image> _waveform;
+	bool _dirty = true;
+	bool _enabled = false;
+	int _component = 0;
+	int _contrast = 0;
 
 	static int const _vertical_margin;
+	static int const _pixel_values;
+	static int const _x_axis_width;
 
 	boost::signals2::connection _viewer_connection;
 };