std::shared_ptr

[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 d0bfc40ae4462ff25ee4ce8a499c56df81555172..037ff0cbf42e77069df101402743826e354b3465 100644 (file)
--- a/src/wx/video_waveform_plot.h
+++ b/src/wx/video_waveform_plot.h
@@ -18,9 +18,10 @@
 
 */
 
+#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 {
@@ -30,12 +31,12 @@ namespace dcp {
 class PlayerVideo;
 class Image;
 class Film;
-class ControlFilmViewer;
+class FilmViewer;
 
 class VideoWaveformPlot : public wxPanel
 {
 public:
-       VideoWaveformPlot (wxWindow* parent, boost::weak_ptr<const Film> film, ControlFilmViewer* 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);
@@ -52,12 +53,12 @@ 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::weak_ptr<const Film> _film;
-       boost::shared_ptr<dcp::OpenJPEGImage> _image;
-       boost::shared_ptr<const Image> _waveform;
+       std::weak_ptr<const Film> _film;
+       std::shared_ptr<dcp::OpenJPEGImage> _image;
+       std::shared_ptr<const Image> _waveform;
        bool _dirty;
        bool _enabled;
        int _component;