X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.h;h=e19068979b5ef2c4724f6aa2ddec848cf1393a0f;hb=93664a46e226aad6cfb71749e3a83904102ea896;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..e19068979 100644
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -18,34 +18,46 @@
 
 */
 
+
 #include "video_view.h"
+#include "lib/filter.h"
+#include "lib/position.h"
+#include "lib/video_filter_graph_set.h"
+#include <dcp/types.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
 
 class FilmViewer;
+class Filter;
+
 
 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 Image> _image;
 	wxTimer _timer;
+	Position<int> _inter_position;
+	dcp::Size _inter_size;
+
+	Filter _rec2020_filter;
+	VideoFilterGraphSet _rec2020_filter_graph;
 };