X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_plot.h;h=36ec63d8a55bbe6b9d10052e7ec3630dd84c267e;hb=63474f980b36b0b845f86b048965314a571a419e;hp=1e38f58906b35d4b7f5d7b00802bcb1126943785;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h index 1e38f5890..36ec63d8a 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,14 +18,14 @@ */ + #include "lib/warnings.h" DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include -#include #include + namespace dcp { class OpenJPEGImage; } @@ -35,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); @@ -55,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;