Put Image in dcpomatic:: to avoid Fastvideo name clash.

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

diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h
index d0bfc40ae4462ff25ee4ce8a499c56df81555172..ecb43e27200dcdbc97bcc22784e4899194401b86 100644 (file)
--- a/src/wx/video_waveform_plot.h
+++ b/src/wx/video_waveform_plot.h
@@ -18,7 +18,10 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
@@ -27,15 +30,18 @@ namespace dcp {
        class OpenJPEGImage;
 }
 
-class PlayerVideo;
-class Image;
+namespace dcpomatic {
+       class Image;
+}
+
 class Film;
-class ControlFilmViewer;
+class FilmViewer;
+class PlayerVideo;
 
 class VideoWaveformPlot : public wxPanel
 {
 public:
-       VideoWaveformPlot (wxWindow* parent, boost::weak_ptr<const Film> film, ControlFilmViewer* viewer);
+       VideoWaveformPlot (wxWindow* parent, boost::weak_ptr<const Film> film, boost::weak_ptr<FilmViewer> viewer);
 
        void set_enabled (bool e);
        void set_component (int c);
@@ -57,7 +63,7 @@ private:
 
        boost::weak_ptr<const Film> _film;
        boost::shared_ptr<dcp::OpenJPEGImage> _image;
-       boost::shared_ptr<const Image> _waveform;
+       boost::shared_ptr<const dcpomatic::Image> _waveform;
        bool _dirty;
        bool _enabled;
        int _component;