X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=36edd6b8b979111285a7df2dcc4421efbd37c0f1;hb=8ccbe70f3c2f5db9e88978a98f3ad5735ece07ab;hp=84d97c751f859bf3f24a7e08fffa9b5a1f9cae54;hpb=ea6b2dae46caa1da829fbf499e83cd6ae3b3773a;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 84d97c751..36edd6b8b 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.
 
@@ -21,14 +21,18 @@
 #include "video_view.h"
 #include "lib/signaller.h"
 #include "lib/position.h"
-#include <wx/wx.h>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/glcanvas.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/util.h>
-#include <boost/shared_ptr.hpp>
+#include <boost/atomic.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #undef None
 #undef Success
+#undef Status
 
 class GLVideoView : public VideoView
 {
@@ -36,7 +40,6 @@ public:
 	GLVideoView (FilmViewer* viewer, wxWindow* parent);
 	~GLVideoView ();
 
-	void set_image (boost::shared_ptr<const Image> image);
 	wxWindow* get () const {
 		return _canvas;
 	}
@@ -44,26 +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 (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 create ();
 	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;
@@ -71,9 +76,9 @@ private:
 	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;
+	std::shared_ptr<wxTimer> _timer;
 };