X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.h;h=f4a8ea22bcf1b4c13087c2cfcc92ba13c9bb6ad8;hb=0a3f387f5d39da2ca38ec90a9593c1b598040dd7;hp=af6655ec4b9bf03481abb5dc61f3ca817d98cfeb;hpb=ec1df37a1940063dc0dbc45ad2dab638bdc92c0d;p=dcpomatic.git diff --git a/src/wx/video_view.h b/src/wx/video_view.h index af6655ec4..f4a8ea22b 100644 --- a/src/wx/video_view.h +++ b/src/wx/video_view.h @@ -21,18 +21,23 @@ #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 { public: VideoView (FilmViewer* viewer) : _viewer (viewer) +#ifdef DCPOMATIC_VARIANT_SWAROOP + , _in_watermark (false) +#endif {} virtual ~VideoView () {} @@ -41,10 +46,32 @@ public: virtual wxWindow* get () const = 0; virtual void update () = 0; + /* 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; + FilmViewer* _viewer; + std::pair, dcpomatic::DCPTime> _player_video; + +#ifdef DCPOMATIC_VARIANT_SWAROOP + bool _in_watermark; + int _watermark_x; + int _watermark_y; +#endif }; #endif