X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fgl_video_view.h;h=e32a1ede95eeea421b808733ea4b0a91058c5a6f;hp=54c64e4eae7c80c7ce31e441535a16a10ea0cca5;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=e153d7f5dc128d97160e41bdda3c4e4a05c7140b diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h index 54c64e4ea..e32a1ede9 100644 --- a/src/wx/gl_video_view.h +++ b/src/wx/gl_video_view.h @@ -23,14 +23,14 @@ #include #include #include - +#include #undef None #undef Success class GLVideoView : public VideoView { public: - GLVideoView (wxWindow* parent); + GLVideoView (FilmViewer* viewer, wxWindow* parent); ~GLVideoView (); void set_image (boost::shared_ptr image); @@ -38,13 +38,25 @@ public: return _canvas; } void update (); + void start (); + + bool vsync_enabled () const { + return _vsync_enabled; + } private: - void paint (); - void draw (); + void paint (); + void draw (); + void thread (); + wxGLContext* context () const; wxGLCanvas* _canvas; - wxGLContext* _context; - GLuint _id; - boost::optional _size; + + wxGLContext* _context; + mutable boost::mutex _context_mutex; + + GLuint _id; + boost::optional _size; + bool _vsync_enabled; + boost::thread* _thread; };