Merge a set of changes which run the OpenGL video updates in a separatev2.15.40

thread, hopefully making things more elegant and robust.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index 686a1a1f3..a6a5cf47f 100644
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -19,6 +19,8 @@
 */
 
 #include "video_view.h"
+#include "lib/position.h"
+#include <dcp/types.h>
 #include <wx/wx.h>
 
 class FilmViewer;
@@ -37,10 +39,17 @@ public:
 	}
 
 	void update ();
+	void start ();
+	bool display_next_frame (bool non_blocking);
 
 private:
+	void refresh_panel ();
 	void paint ();
+	void timer ();
 
 	wxPanel* _panel;
 	boost::shared_ptr<const Image> _image;
+	wxTimer _timer;
+	Position<int> _inter_position;
+	dcp::Size _inter_size;
 };