diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-20 23:03:27 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-08 21:56:47 +0100 |
| commit | ac25cd82d5d29c79b46033a742aaea33c700a524 (patch) | |
| tree | 0a05e33e90239555bb9fb22e9b1f81cd1b22f648 /src/wx/video_view.h | |
| parent | 444e1d4e0062677220d32b78b97a4b730156b514 (diff) | |
Move _player_video into VideoView.
Diffstat (limited to 'src/wx/video_view.h')
| -rw-r--r-- | src/wx/video_view.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/wx/video_view.h b/src/wx/video_view.h index 873df162b..f4a8ea22b 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 <boost/shared_ptr.hpp> #include <boost/signals2.hpp> class Image; class wxWindow; class FilmViewer; +class PlayerVideo; class VideoView { @@ -47,6 +49,8 @@ public: /* XXX_b: make pure */ virtual void start () {} + void clear (); + boost::signals2::signal<void()> Sized; /* XXX_b: to remove */ @@ -57,7 +61,11 @@ public: virtual void display_player_video () {} protected: + /* XXX_b: to remove */ + friend class FilmViewer; + FilmViewer* _viewer; + std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video; #ifdef DCPOMATIC_VARIANT_SWAROOP bool _in_watermark; |