X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_dialog.h;h=25bd462aee991422e89647215eea69e9fb358b45;hb=f802565830bed9ec9e7ad6c16ccaa7b0700625d9;hp=1cfbb73b725c31c3044e9a0bfdd262b7dfb49d0a;hpb=23583dfb56181c76126e652042e9d1940367aa27;p=dcpomatic.git diff --git a/src/wx/video_waveform_dialog.h b/src/wx/video_waveform_dialog.h index 1cfbb73b7..25bd462ae 100644 --- a/src/wx/video_waveform_dialog.h +++ b/src/wx/video_waveform_dialog.h @@ -18,17 +18,22 @@ */ + +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include -#include +DCPOMATIC_ENABLE_WARNINGS +#include + class VideoWaveformPlot; -class ControlFilmViewer; +class FilmViewer; class Film; class VideoWaveformDialog : public wxDialog { public: - VideoWaveformDialog (wxWindow* parent, boost::weak_ptr film, ControlFilmViewer* viewer); + VideoWaveformDialog (wxWindow* parent, std::weak_ptr film, std::weak_ptr viewer); private: void shown (wxShowEvent &); @@ -36,7 +41,7 @@ private: void contrast_changed (); void mouse_moved (int x1, int x2, int y1, int y2); - ControlFilmViewer* _viewer; + std::weak_ptr _viewer; VideoWaveformPlot* _plot; wxChoice* _component; wxSlider* _contrast;