X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=fd9154a7338d946a8c1b31a619adde843f9f4324;hb=6c18c9a37f3a1c8ea1d3ca7791a0f1380b23f5d1;hp=b7b30696f1129415fabb5780471b68ecce904516;hpb=f984990795e548e2c4160d17d0fa54a40c8b1311;p=dcpomatic.git

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index b7b30696f..fd9154a73 100644
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -18,14 +18,25 @@
 
 */
 
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/glcanvas.h>
+#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 "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/glcanvas.h>
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/util.h>
 #include <boost/atomic.hpp>
 #include <boost/thread.hpp>
@@ -34,6 +45,26 @@ DCPOMATIC_ENABLE_WARNINGS
 #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
 {
 public:
@@ -60,7 +91,7 @@ public:
 private:
 	void set_image (std::shared_ptr<const PlayerVideo> pv);
 	void set_image_and_draw ();
-	void draw (Position<int> inter_position, dcp::Size inter_size);
+	void draw ();
 	void thread ();
 	void thread_playing ();
 	void request_one_shot ();
@@ -68,15 +99,44 @@ private:
 	void ensure_context ();
 	void size_changed (wxSizeEvent const &);
 	void setup_shaders ();
-	void set_border_colour (GLuint program);
+	void set_outline_content_colour (GLuint program);
+	void set_crop_guess_colour (GLuint program);
 
 	wxGLCanvas* _canvas;
 	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;
+	Last<boost::optional<dcpomatic::Rect<float>>> _last_crop_guess;
+
 	boost::atomic<wxSize> _canvas_size;
-	GLuint _video_texture;
-	boost::optional<dcp::Size> _size;
-	bool _have_storage;
+	std::unique_ptr<Texture> _video_texture;
+	std::unique_ptr<Texture> _subtitle_texture;
+	bool _have_subtitle_to_render = false;
 	bool _vsync_enabled;
 	boost::thread _thread;
 
@@ -93,3 +153,5 @@ private:
 
 	std::map<GLenum, std::string> _information;
 };
+
+#endif