Fix confusion between one-shot and playing causing surprising

[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 cdc9fd530ae3045157cdcf003d19421355df145d..b91078da03a1efe537cf054d67ea2c1c34d14fdc 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -19,30 +19,63 @@
 */
 
 #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
 
 class GLVideoView : public VideoView
 {
 public:
-       GLVideoView (wxWindow* parent);
+       GLVideoView (FilmViewer* viewer, wxWindow* parent);
        ~GLVideoView ();
 
        void set_image (boost::shared_ptr<const Image> image);
        wxWindow* get () const {
                return _canvas;
        }
+       void update ();
+       void start ();
+       void stop ();
+
+       bool display_next_frame (bool);
+
+       bool vsync_enabled () const {
+               return _vsync_enabled;
+       }
 
 private:
-        void paint (wxPaintEvent& event);
+       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 ();
 
+       /* 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;
+       wxGLContext* _context;
+
+       GLuint _id;
+       boost::optional<dcp::Size> _size;
+       bool _have_storage;
+       bool _vsync_enabled;
+       boost::thread _thread;
+
+       boost::mutex _playing_mutex;
+       boost::condition _thread_work_condition;
+       boost::atomic<bool> _playing;
+       boost::atomic<bool> _one_shot;
+
+       boost::shared_ptr<wxTimer> _timer;
 };