X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.h;h=e19068979b5ef2c4724f6aa2ddec848cf1393a0f;hb=4d8f96e15edb4807cc9773cc7f9eb6aa56ac2dc8;hp=a6a5cf47f1783b44235c9d771c6d359ff642b6d6;hpb=166f44ff1b500f684417d660bb349d35383996ee;p=dcpomatic.git diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h index a6a5cf47f..e19068979 100644 --- a/src/wx/simple_video_view.h +++ b/src/wx/simple_video_view.h @@ -18,29 +18,34 @@ */ + #include "video_view.h" +#include "lib/filter.h" #include "lib/position.h" +#include "lib/video_filter_graph_set.h" #include +#include +LIBDCP_DISABLE_WARNINGS #include +LIBDCP_ENABLE_WARNINGS + class FilmViewer; +class Filter; + class SimpleVideoView : public VideoView { public: SimpleVideoView (FilmViewer* viewer, wxWindow* parent); - void set_image (boost::shared_ptr image) { - _image = image; - } - - wxWindow* get () const { + wxWindow* get () const override { return _panel; } - void update (); - void start (); - bool display_next_frame (bool non_blocking); + void update () override; + void start () override; + NextFrameResult display_next_frame (bool non_blocking) override; private: void refresh_panel (); @@ -48,8 +53,11 @@ private: void timer (); wxPanel* _panel; - boost::shared_ptr _image; + std::shared_ptr _image; wxTimer _timer; Position _inter_position; dcp::Size _inter_size; + + Filter _rec2020_filter; + VideoFilterGraphSet _rec2020_filter_graph; };