C++11 tidying.

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

diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h
index 0f8bd33cdb9c329d17ec1d518d737fe8fea55466..36ec63d8a55bbe6b9d10052e7ec3630dd84c267e 100644 (file)
--- a/src/wx/video_waveform_plot.h
+++ b/src/wx/video_waveform_plot.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,42 +18,57 @@
 
 */
 
+
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+DCPOMATIC_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, std::weak_ptr<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;