X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_dialog.h;h=e524dc92148c0d58f3ffa4a6a4cdc2e39406ec77;hb=23f2862929cc21c32c4a7ceb4bbdca0aafcb9454;hp=252720f606214764d7a328b2ee555dd328c05df9;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git diff --git a/src/wx/video_waveform_dialog.h b/src/wx/video_waveform_dialog.h index 252720f60..e524dc921 100644 --- a/src/wx/video_waveform_dialog.h +++ b/src/wx/video_waveform_dialog.h @@ -18,20 +18,23 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS -#include +LIBDCP_ENABLE_WARNINGS +#include + class VideoWaveformPlot; class FilmViewer; class Film; + class VideoWaveformDialog : public wxDialog { public: - VideoWaveformDialog (wxWindow* parent, boost::weak_ptr film, boost::weak_ptr viewer); + VideoWaveformDialog(wxWindow* parent, std::weak_ptr film, FilmViewer& viewer); private: void shown (wxShowEvent &); @@ -39,7 +42,7 @@ private: void contrast_changed (); void mouse_moved (int x1, int x2, int y1, int y2); - boost::weak_ptr _viewer; + FilmViewer& _viewer; VideoWaveformPlot* _plot; wxChoice* _component; wxSlider* _contrast;