Cleanup: use layout() wrapper.

[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 70c81ea79e4bbeb72ce67d16c07ac5186a4cf7f7..964f6f1ab9db2db8469e1fce8a36bd2d93279fa3 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -99,7 +99,8 @@ private:
        void ensure_context ();
        void size_changed (wxSizeEvent const &);
        void setup_shaders ();
-       void set_border_colour (GLuint program);
+       void set_outline_content_colour (GLuint program);
+       void set_crop_guess_colour (GLuint program);
 
        wxGLCanvas* _canvas;
        wxGLContext* _context;
@@ -130,8 +131,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;