Various thread cleanups.

[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 e32a1ede95eeea421b808733ea4b0a91058c5a6f..84d97c751f859bf3f24a7e08fffa9b5a1f9cae54 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -19,11 +19,14 @@
 */
 
 #include "video_view.h"
+#include "lib/signaller.h"
+#include "lib/position.h"
 #include <wx/wx.h>
 #include <wx/glcanvas.h>
 #include <dcp/util.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
 #undef None
 #undef Success
 
@@ -39,24 +42,38 @@ public:
        }
        void update ();
        void start ();
+       void stop ();
+
+       bool display_next_frame (bool);
 
        bool vsync_enabled () const {
                return _vsync_enabled;
        }
 
 private:
-       void paint ();
-       void draw ();
+       void draw (Position<int> inter_position, dcp::Size inter_size);
        void thread ();
-       wxGLContext* context () const;
+       void request_one_shot ();
+       void create ();
+       void check_for_butler_errors ();
 
+       /* 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;
-       mutable boost::mutex _context_mutex;
 
        GLuint _id;
        boost::optional<dcp::Size> _size;
+       bool _have_storage;
        bool _vsync_enabled;
-       boost::thread* _thread;
+       boost::thread _thread;
+
+       boost::mutex _playing_mutex;
+       boost::condition _playing_condition;
+       bool _playing;
+       bool _one_shot;
+
+       boost::shared_ptr<wxTimer> _timer;
 };