X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=36edd6b8b979111285a7df2dcc4421efbd37c0f1;hb=cf7b5fd94e50f740ab93f52343610d01c80ac6d5;hp=1f9ed08ea75e78e2ef53bbbe48ca151389ea3977;hpb=27e5d372e8ca10ad0c1fd189f9dc76eb14d7a3ca;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 1f9ed08ea..36edd6b8b 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -28,7 +28,6 @@ DCPOMATIC_DISABLE_WARNINGS
 DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/util.h>
 #include <boost/atomic.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #undef None
@@ -48,28 +47,28 @@ public:
 	void start ();
 	void stop ();
 
-	bool display_next_frame (bool);
+	NextFrameResult display_next_frame (bool);
 
 	bool vsync_enabled () const {
 		return _vsync_enabled;
 	}
 
 private:
-	void set_image (boost::shared_ptr<const Image> image);
+	void set_image (std::shared_ptr<const Image> image);
 	void set_image_and_draw ();
 	void draw (Position<int> inter_position, dcp::Size inter_size);
 	void thread ();
 	void thread_playing ();
 	void request_one_shot ();
 	void check_for_butler_errors ();
+	void ensure_context ();
+	void size_changed (wxSizeEvent const &);
 
-	/* 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;
 
+	boost::atomic<wxSize> _canvas_size;
+
 	GLuint _id;
 	boost::optional<dcp::Size> _size;
 	bool _have_storage;
@@ -81,5 +80,5 @@ private:
 	boost::atomic<bool> _playing;
 	boost::atomic<bool> _one_shot;
 
-	boost::shared_ptr<wxTimer> _timer;
+	std::shared_ptr<wxTimer> _timer;
 };