Move _inter_position out of FilmViewer.

[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 44a4057fd1f55cd816fe0b377b91d3b22de024e9..01434d56915b0e8a03688c59a6075dbbb0c05f52 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -20,11 +20,13 @@
 
 #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
 
@@ -49,9 +51,11 @@ public:
        }
 
 private:
-       void paint ();
-       void draw ();
+       void draw (Position<int> inter_position);
        void thread ();
+       void request_one_shot ();
+       void create ();
+       void check_for_butler_errors ();
 
        wxGLCanvas* _canvas;
        wxGLContext* _context;
@@ -60,4 +64,11 @@ private:
        boost::optional<dcp::Size> _size;
        bool _vsync_enabled;
        boost::thread* _thread;
+
+       boost::mutex _playing_mutex;
+       boost::condition _playing_condition;
+       bool _playing;
+       bool _one_shot;
+
+       boost::shared_ptr<wxTimer> _timer;
 };