X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=84d97c751f859bf3f24a7e08fffa9b5a1f9cae54;hb=ea6b2dae46caa1da829fbf499e83cd6ae3b3773a;hp=162438a5b49565af1391c462d0349ee53f409ab2;hpb=89780827d5d6ec9127eae0108d10f71dc79d1a72;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 162438a5b..84d97c751 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -20,6 +20,7 @@
 
 #include "video_view.h"
 #include "lib/signaller.h"
+#include "lib/position.h"
 #include <wx/wx.h>
 #include <wx/glcanvas.h>
 #include <dcp/util.h>
@@ -50,19 +51,24 @@ public:
 	}
 
 private:
-	void draw ();
+	void draw (Position<int> inter_position, dcp::Size inter_size);
 	void thread ();
 	void request_one_shot ();
 	void create ();
 	void check_for_butler_errors ();
 
+	/* Mutex for use of _canvas; it's only contended when our ::thread
+	   is started up so this may be overkill.
+	 */
+	boost::mutex _canvas_mutex;
 	wxGLCanvas* _canvas;
 	wxGLContext* _context;
 
 	GLuint _id;
 	boost::optional<dcp::Size> _size;
+	bool _have_storage;
 	bool _vsync_enabled;
-	boost::thread* _thread;
+	boost::thread _thread;
 
 	boost::mutex _playing_mutex;
 	boost::condition _playing_condition;