X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=d8ee65da63e04d63fc572676d6ff7b9a2c8b24f8;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=44a4057fd1f55cd816fe0b377b91d3b22de024e9;hpb=edfb627f1226814ac804473b54d781ffd6db2700;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 44a4057fd..d8ee65da6 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.
 
@@ -20,13 +20,19 @@
 
 #include "video_view.h"
 #include "lib/signaller.h"
-#include <wx/wx.h>
+#include "lib/position.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
 {
@@ -34,7 +40,6 @@ public:
 	GLVideoView (FilmViewer* viewer, wxWindow* parent);
 	~GLVideoView ();
 
-	void set_image (boost::shared_ptr<const Image> image);
 	wxWindow* get () const {
 		return _canvas;
 	}
@@ -42,22 +47,38 @@ public:
 	void start ();
 	void stop ();
 
-	bool display_next_frame (bool);
+	NextFrameResult display_next_frame (bool);
 
 	bool vsync_enabled () const {
 		return _vsync_enabled;
 	}
 
 private:
-	void paint ();
-	void draw ();
+	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 ();
 
+	/* 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 _thread_work_condition;
+	boost::atomic<bool> _playing;
+	boost::atomic<bool> _one_shot;
+
+	std::shared_ptr<wxTimer> _timer;
 };