X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_plot.h;h=037ff0cbf42e77069df101402743826e354b3465;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=7e9dbf70999691da6ca2ee793a2bae1c8814d3cc;hpb=4aa2c70aa6b240d426f782b215749bee7399d6c4;p=dcpomatic.git diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h index 7e9dbf709..037ff0cbf 100644 --- 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 -#include -#include +DCPOMATIC_ENABLE_WARNINGS #include namespace dcp { @@ -35,7 +36,7 @@ class FilmViewer; class VideoWaveformPlot : public wxPanel { public: - VideoWaveformPlot (wxWindow* parent, boost::weak_ptr film, FilmViewer* viewer); + VideoWaveformPlot (wxWindow* parent, std::weak_ptr film, std::weak_ptr 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); + void set_image (std::shared_ptr); void mouse_moved (wxMouseEvent &); - boost::weak_ptr _film; - boost::shared_ptr _image; - boost::shared_ptr _waveform; + std::weak_ptr _film; + std::shared_ptr _image; + std::shared_ptr _waveform; bool _dirty; bool _enabled; int _component;