X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_plot.h;h=362efa2acae5b535724c843ddbe4e9359b2d9b2e;hb=d4651b1595eb0aab4d956795f757302fef2f31d7;hp=3801860740008cf82550a5431f4d50de46893100;hpb=c370a1f38215f6461cf4366e6885757e7aa2b96a;p=dcpomatic.git diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h index 380186074..362efa2ac 100644 --- a/src/wx/video_waveform_plot.h +++ b/src/wx/video_waveform_plot.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,11 +18,14 @@ */ + +#include +LIBDCP_DISABLE_WARNINGS #include -#include -#include +LIBDCP_ENABLE_WARNINGS #include + namespace dcp { class OpenJPEGImage; } @@ -32,10 +35,11 @@ class Image; class Film; class FilmViewer; + class VideoWaveformPlot : public wxPanel { public: - VideoWaveformPlot (wxWindow* parent, boost::weak_ptr film, boost::weak_ptr viewer); + VideoWaveformPlot (wxWindow* parent, std::weak_ptr film, std::weak_ptr viewer); void set_enabled (bool e); void set_component (int c); @@ -52,16 +56,16 @@ 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; - bool _dirty; - bool _enabled; - int _component; - int _contrast; + std::weak_ptr _film; + std::shared_ptr _image; + std::shared_ptr _waveform; + bool _dirty = true; + bool _enabled = false; + int _component = 0; + int _contrast = 0; static int const _vertical_margin; static int const _pixel_values;