X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fsimple_video_view.h;h=ba7fc81f82e26b28a32b2e41e87bedeb8cfc9fb8;hb=0254f2d12acb2ff8d770b4e47dc15599d145fe17;hp=d271416528390ad39b04377614d53098f3791962;hpb=7c33cdd95a23ff784c0e0731a9d1444ce9bb8f09;p=dcpomatic.git

diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index d27141652..ba7fc81f8 100644
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -19,7 +19,12 @@
 */
 
 #include "video_view.h"
+#include "lib/position.h"
+#include "lib/warnings.h"
+#include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class FilmViewer;
 
@@ -28,24 +33,22 @@ class SimpleVideoView : public VideoView
 public:
 	SimpleVideoView (FilmViewer* viewer, wxWindow* parent);
 
-	void set_image (boost::shared_ptr<const Image> image) {
-		_image = image;
-	}
-
-	wxWindow* get () const {
+	wxWindow* get () const override {
 		return _panel;
 	}
 
-	void update ();
-
-	void start ();
+	void update () override;
+	void start () override;
+	NextFrameResult display_next_frame (bool non_blocking) override;
 
 private:
+	void refresh_panel ();
 	void paint ();
 	void timer ();
-	bool get (bool lazy);
 
 	wxPanel* _panel;
-	boost::shared_ptr<const Image> _image;
+	std::shared_ptr<const dcpomatic::Image> _image;
 	wxTimer _timer;
+	Position<int> _inter_position;
+	dcp::Size _inter_size;
 };