Only support GLVideoView when building with wxWidgets >= 3.1.0.

[dcpomatic.git] / src / wx / gl_video_view.h

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 4e61b5b4c8ab0765b38c131d9ca5af1065ee97c8..7ef7b565aaa2fa00f787a8eb212bfc4ab1a30fe0 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -18,14 +18,25 @@
 
 */
 
-#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
+
+/* 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>
@@ -45,7 +56,7 @@ public:
        Texture& operator= (Texture const&) = delete;
 
        void bind ();
-       bool set (std::shared_ptr<const Image> image);
+       void set (std::shared_ptr<const Image> image);
 
 private:
        GLuint _name;
@@ -93,8 +104,37 @@ private:
        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;
+
        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;
 
@@ -111,3 +151,5 @@ private:
 
        std::map<GLenum, std::string> _information;
 };
+
+#endif