Fix warning cause by previous libdcp bump.

[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 273d50dc8c43dcd37858e994e2c920f78642d0f6..69de7b76fdbcd4e9555113327ebe92259d2c358b 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -25,6 +25,10 @@ LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 LIBDCP_ENABLE_WARNINGS
 
+#undef None
+#undef Success
+#undef Status
+
 
 /* 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
@@ -34,6 +38,7 @@ LIBDCP_ENABLE_WARNINGS
  */
 #if wxCHECK_VERSION(3,1,0)
 
+
 #include "video_view.h"
 #include "lib/signaller.h"
 #include "lib/position.h"
@@ -41,9 +46,6 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/atomic.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
-#undef None
-#undef Success
-#undef Status
 
 
 class Texture
@@ -100,6 +102,7 @@ private:
        void size_changed (wxSizeEvent const &);
        void setup_shaders ();
        void set_outline_content_colour (GLuint program);
+       void set_crop_guess_colour (GLuint program);
 
        wxGLCanvas* _canvas;
        wxGLContext* _context;
@@ -130,8 +133,10 @@ private:
        Last<Position<int>> _last_inter_position;
        Last<dcp::Size> _last_inter_size;
        Last<dcp::Size> _last_out_size;
+       Last<boost::optional<dcpomatic::Rect<float>>> _last_crop_guess;
 
        boost::atomic<wxSize> _canvas_size;
+       boost::atomic<bool> _rec2020;
        std::unique_ptr<Texture> _video_texture;
        std::unique_ptr<Texture> _subtitle_texture;
        bool _have_subtitle_to_render = false;