X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=84d97c751f859bf3f24a7e08fffa9b5a1f9cae54;hb=bcc4e2f7dc4cd5658e199ddacb7202b00ec72cf1;hp=22b6d8513d18e4434be85e57887acf2c30a54ac8;hpb=798819f74c6d194b95d3458f88b7ad60ef5f282c;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 22b6d8513..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,20 +51,29 @@ public:
 	}
 
 private:
-	void paint ();
-	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;
 	bool _playing;
 	bool _one_shot;
+
+	boost::shared_ptr<wxTimer> _timer;
 };