X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.h;h=827d1bf73d65a2f0e8a93c2c7d5c4862dd7ec834;hp=dda18058d4e6a4309aa31ffeed1b58ce87d77d95;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=ff64d7f42884bb21e61c5f5b242c41415a5934b1 diff --git a/src/wx/video_view.h b/src/wx/video_view.h index dda18058d..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,10 +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;