Dolby is apparently recreating all their certificates (as they will soon expire)...

[dcpomatic.git] / src / wx / video_waveform_dialog.h

diff --git a/src/wx/video_waveform_dialog.h b/src/wx/video_waveform_dialog.h
index 25bd462aee991422e89647215eea69e9fb358b45..e524dc92148c0d58f3ffa4a6a4cdc2e39406ec77 100644 (file)
--- a/src/wx/video_waveform_dialog.h
+++ b/src/wx/video_waveform_dialog.h
@@ -19,10 +19,10 @@
 */
 
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <memory>
 
 
@@ -30,10 +30,11 @@ class VideoWaveformPlot;
 class FilmViewer;
 class Film;
 
+
 class VideoWaveformDialog : public wxDialog
 {
 public:
-       VideoWaveformDialog (wxWindow* parent, std::weak_ptr<const Film> film, std::weak_ptr<FilmViewer> viewer);
+       VideoWaveformDialog(wxWindow* parent, std::weak_ptr<const Film> film, FilmViewer& viewer);
 
 private:
        void shown (wxShowEvent &);
@@ -41,7 +42,7 @@ private:
        void contrast_changed ();
        void mouse_moved (int x1, int x2, int y1, int y2);
 
-       std::weak_ptr<FilmViewer> _viewer;
+       FilmViewer& _viewer;
        VideoWaveformPlot* _plot;
        wxChoice* _component;
        wxSlider* _contrast;