*/
-#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>
#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:
}
private:
- void set_image (std::shared_ptr<const Image> image);
+ 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 ();
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;
- GLuint _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;
boost::atomic<bool> _one_shot;
GLuint _vao;
- GLint _draw_border;
+ GLint _fragment_type;
bool _setup_shaders_done = false;
std::shared_ptr<wxTimer> _timer;
std::map<GLenum, std::string> _information;
};
+
+#endif