Use libdcp's warnings.h

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

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 7ef7b565aaa2fa00f787a8eb212bfc4ab1a30fe0..70c81ea79e4bbeb72ce67d16c07ac5186a4cf7f7 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -19,12 +19,12 @@
 */
 
 
-#include "lib/warnings.h"
-
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/glcanvas.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+
 
 /* The OpenGL API in wxWidgets 3.0.x is sufficiently different to make it awkward to support,
  * and I think it may even have things missing that we require (e.g. the attributes parameter
@@ -91,7 +91,7 @@ public:
 private:
        void set_image (std::shared_ptr<const PlayerVideo> pv);
        void set_image_and_draw ();
-       void draw (Position<int> inter_position, dcp::Size inter_size);
+       void draw ();
        void thread ();
        void thread_playing ();
        void request_one_shot ();