diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-04 21:16:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-07 22:48:29 +0100 |
| commit | dd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (patch) | |
| tree | e56a3f82fb9e1c8602f265bea0d0688d8a018644 /src/wx/video_waveform_plot.h | |
| parent | 0d35820cf50d2789752b8776683b26d04642518d (diff) | |
std::shared_ptr
Diffstat (limited to 'src/wx/video_waveform_plot.h')
| -rw-r--r-- | src/wx/video_waveform_plot.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h index f107f0399..037ff0cbf 100644 --- a/src/wx/video_waveform_plot.h +++ b/src/wx/video_waveform_plot.h @@ -22,8 +22,6 @@ DCPOMATIC_DISABLE_WARNINGS #include <wx/wx.h> DCPOMATIC_ENABLE_WARNINGS -#include <boost/shared_ptr.hpp> -#include <boost/weak_ptr.hpp> #include <boost/signals2.hpp> namespace dcp { @@ -38,7 +36,7 @@ class FilmViewer; class VideoWaveformPlot : public wxPanel { public: - VideoWaveformPlot (wxWindow* parent, boost::weak_ptr<const Film> film, boost::weak_ptr<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); @@ -55,12 +53,12 @@ private: void paint (); void sized (wxSizeEvent &); void create_waveform (); - void set_image (boost::shared_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; |