Setup Butler::_prepare_only_proxy on construction.

[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 827b12861c5d47ccb5caadadc668fdbb5b5222b2..4e61b5b4c8ab0765b38c131d9ca5af1065ee97c8 100644 (file)
--- 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.
 
@@ -21,14 +21,38 @@
 #include "video_view.h"
 #include "lib/signaller.h"
 #include "lib/position.h"
-#include <wx/wx.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 Texture
+{
+public:
+       Texture (GLint unpack_alignment);
+       ~Texture ();
+
+       Texture (Texture const&) = delete;
+       Texture& operator= (Texture const&) = delete;
+
+       void bind ();
+       bool set (std::shared_ptr<const Image> image);
+
+private:
+       GLuint _name;
+       GLint _unpack_alignment;
+       boost::optional<dcp::Size> _size;
+};
+
 
 class GLVideoView : public VideoView
 {
@@ -36,43 +60,54 @@ 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 start ();
-       void stop ();
+       void update () override;
+       void start () override;
+       void stop () override;
 
-       bool display_next_frame (bool);
+       NextFrameResult display_next_frame (bool) override;
 
        bool vsync_enabled () const {
                return _vsync_enabled;
        }
 
+       std::map<GLenum, std::string> information () const {
+               return _information;
+       }
+
 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 thread ();
+       void thread_playing ();
        void request_one_shot ();
-       void create ();
        void check_for_butler_errors ();
+       void ensure_context ();
+       void size_changed (wxSizeEvent const &);
+       void setup_shaders ();
+       void set_border_colour (GLuint program);
 
-       /* 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;
+       boost::atomic<wxSize> _canvas_size;
+       std::unique_ptr<Texture> _video_texture;
        bool _vsync_enabled;
-       boost::thread* _thread;
+       boost::thread _thread;
 
        boost::mutex _playing_mutex;
-       boost::condition _playing_condition;
-       bool _playing;
-       bool _one_shot;
+       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;
 
-       boost::shared_ptr<wxTimer> _timer;
+       std::map<GLenum, std::string> _information;
 };