X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=273d50dc8c43dcd37858e994e2c920f78642d0f6;hb=3116ceec101f73796bea6ea2bef637c43d64f46a;hp=42a3f89ba8236ae6b88407c876fd9b53a094d310;hpb=ec1df37a1940063dc0dbc45ad2dab638bdc92c0d;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 42a3f89ba..273d50dc8 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.
 
@@ -18,14 +18,52 @@
 
 */
 
-#include "video_view.h"
-#include <wx/wx.h>
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/glcanvas.h>
-#include <dcp/util.h>
-#include <boost/shared_ptr.hpp>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
+
+/* The OpenGL API in wxWidgets 3.0.x is sufficiently different to make it awkward to support,
+ * and I think it may even have things missing that we require (e.g. the attributes parameter
+ * to wxGLContext).  Hence we only support the GLVideoView on wxWidgets 3.1.0 and higher
+ * (which only excludes the old macOS builds, since wxWidgets 3.1.x does not support macOS
+ * 10.9 or earlier).
+ */
+#if wxCHECK_VERSION(3,1,0)
+
+#include "video_view.h"
+#include "lib/signaller.h"
+#include "lib/position.h"
+#include <dcp/util.h>
+#include <boost/atomic.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
 #undef None
 #undef Success
+#undef Status
+
+
+class Texture
+{
+public:
+	Texture (GLint unpack_alignment);
+	~Texture ();
+
+	Texture (Texture const&) = delete;
+	Texture& operator= (Texture const&) = delete;
+
+	void bind ();
+	void set (std::shared_ptr<const Image> image);
+
+private:
+	GLuint _name;
+	GLint _unpack_alignment;
+	boost::optional<dcp::Size> _size;
+};
+
 
 class GLVideoView : public VideoView
 {
@@ -33,18 +71,85 @@ public:
 	GLVideoView (FilmViewer* viewer, wxWindow* parent);
 	~GLVideoView ();
 
-	void set_image (boost::shared_ptr<const Image> image);
-	wxWindow* get () const {
+	wxWindow* get () const override {
 		return _canvas;
 	}
-	void update ();
+	void update () override;
+	void start () override;
+	void stop () override;
+
+	NextFrameResult display_next_frame (bool) override;
+
+	bool vsync_enabled () const {
+		return _vsync_enabled;
+	}
+
+	std::map<GLenum, std::string> information () const {
+		return _information;
+	}
 
 private:
-        void paint ();
-        void draw ();
+	void set_image (std::shared_ptr<const PlayerVideo> pv);
+	void set_image_and_draw ();
+	void draw ();
+	void thread ();
+	void thread_playing ();
+	void request_one_shot ();
+	void check_for_butler_errors ();
+	void ensure_context ();
+	void size_changed (wxSizeEvent const &);
+	void setup_shaders ();
+	void set_outline_content_colour (GLuint program);
 
 	wxGLCanvas* _canvas;
-        wxGLContext* _context;
-        GLuint _id;
-        boost::optional<dcp::Size> _size;
+	wxGLContext* _context;
+
+	template <class T>
+	class Last
+	{
+	public:
+		void set_next (T const& next) {
+			_next = next;
+		}
+
+		bool changed () const {
+			return !_value || *_value != _next;
+		}
+
+		void update () {
+			_value = _next;
+		}
+
+	private:
+		boost::optional<T> _value;
+		T _next;
+	};
+
+	Last<wxSize> _last_canvas_size;
+	Last<dcp::Size> _last_video_size;
+	Last<Position<int>> _last_inter_position;
+	Last<dcp::Size> _last_inter_size;
+	Last<dcp::Size> _last_out_size;
+
+	boost::atomic<wxSize> _canvas_size;
+	std::unique_ptr<Texture> _video_texture;
+	std::unique_ptr<Texture> _subtitle_texture;
+	bool _have_subtitle_to_render = false;
+	bool _vsync_enabled;
+	boost::thread _thread;
+
+	boost::mutex _playing_mutex;
+	boost::condition _thread_work_condition;
+	boost::atomic<bool> _playing;
+	boost::atomic<bool> _one_shot;
+
+	GLuint _vao;
+	GLint _fragment_type;
+	bool _setup_shaders_done = false;
+
+	std::shared_ptr<wxTimer> _timer;
+
+	std::map<GLenum, std::string> _information;
 };
+
+#endif