X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.h;h=e19068979b5ef2c4724f6aa2ddec848cf1393a0f;hb=HEAD;hp=323047adaca9182fcc237c0dfa6a330aa3f6cfd7;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h index 323047ada..e19068979 100644 --- a/src/wx/simple_video_view.h +++ b/src/wx/simple_video_view.h @@ -18,41 +18,46 @@ */ + #include "video_view.h" +#include "lib/filter.h" #include "lib/position.h" -#include "lib/warnings.h" +#include "lib/video_filter_graph_set.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + class FilmViewer; +class Filter; + class SimpleVideoView : public VideoView { public: SimpleVideoView (FilmViewer* viewer, wxWindow* parent); - 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 set_image (boost::shared_ptr image) { - _image = image; - } - void refresh_panel (); void paint (); 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; };