X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fvideo_waveform_dialog.h;h=25bd462aee991422e89647215eea69e9fb358b45;hb=081525ef1c392465fc5a0bb4be79af8e84655bc4;hp=aa134f7a5f9ad236cd7a48697914dd895dcd98a0;hpb=4aa2c70aa6b240d426f782b215749bee7399d6c4;p=dcpomatic.git diff --git a/src/wx/video_waveform_dialog.h b/src/wx/video_waveform_dialog.h index aa134f7a5..25bd462ae 100644 --- a/src/wx/video_waveform_dialog.h +++ b/src/wx/video_waveform_dialog.h @@ -18,8 +18,13 @@ */ + +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include -#include +DCPOMATIC_ENABLE_WARNINGS +#include + class VideoWaveformPlot; class FilmViewer; @@ -28,7 +33,7 @@ class Film; class VideoWaveformDialog : public wxDialog { public: - VideoWaveformDialog (wxWindow* parent, boost::weak_ptr film, FilmViewer* 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); - FilmViewer* _viewer; + std::weak_ptr _viewer; VideoWaveformPlot* _plot; wxChoice* _component; wxSlider* _contrast;