X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=3675b8ddcb6025dce1c84b37a917e6b3d7ee2e57;hb=14ea977668f8919d089f113b71a38567576ccc37;hp=827b12861c5d47ccb5caadadc668fdbb5b5222b2;hpb=f77529bdfa01ae13f889442900988fc401b63c62;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 827b12861..3675b8ddc 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,6 +24,7 @@
 #include <wx/wx.h>
 #include <wx/glcanvas.h>
 #include <dcp/util.h>
+#include <boost/atomic.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
@@ -36,7 +37,6 @@ public:
 	GLVideoView (FilmViewer* viewer, wxWindow* parent);
 	~GLVideoView ();
 
-	void set_image (boost::shared_ptr<const Image> image);
 	wxWindow* get () const {
 		return _canvas;
 	}
@@ -51,8 +51,11 @@ public:
 	}
 
 private:
+	void set_image (boost::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 create ();
 	void check_for_butler_errors ();
@@ -66,13 +69,14 @@ private:
 
 	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::condition _thread_work_condition;
+	boost::atomic<bool> _playing;
+	boost::atomic<bool> _one_shot;
 
 	boost::shared_ptr<wxTimer> _timer;
 };