X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.h;h=827d1bf73d65a2f0e8a93c2c7d5c4862dd7ec834;hp=80d6a50fc454050174de5bad6dcd598548cd85f0;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=7c33cdd95a23ff784c0e0731a9d1444ce9bb8f09;ds=sidebyside diff --git a/src/wx/video_view.h b/src/wx/video_view.h index 80d6a50fc..827d1bf73 100644 --- a/src/wx/video_view.h +++ b/src/wx/video_view.h @@ -21,12 +21,14 @@ #ifndef DCPOMATIC_VIDEO_VIEW_H #define DCPOMATIC_VIDEO_VIEW_H +#include "lib/dcpomatic_time.h" #include #include class Image; class wxWindow; class FilmViewer; +class PlayerVideo; class VideoView { @@ -47,15 +49,25 @@ public: /* XXX_b: make pure */ virtual void start () {} + void clear (); + boost::signals2::signal Sized; /* XXX_b: to remove */ virtual bool get (bool) { return true; } + /* XXX_b: to remove */ + virtual void display_player_video () {} protected: + /* XXX_b: to remove */ + friend class FilmViewer; + + bool get_next_frame (bool non_blocking); + FilmViewer* _viewer; + std::pair, dcpomatic::DCPTime> _player_video; #ifdef DCPOMATIC_VARIANT_SWAROOP bool _in_watermark;