X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fvideo_view.h;h=4a94aa879bf4bc3beddf093b50c7ea8dc7eee3be;hp=d6e76ada703ed240dbf447e00e9c53869cb704e5;hb=9001a63be211fd8e97431f8fc07c66af01554f5a;hpb=805487369e57e5eb57911805ba6de78b653d79ad diff --git a/src/wx/video_view.h b/src/wx/video_view.h index d6e76ada7..4a94aa879 100644 --- a/src/wx/video_view.h +++ b/src/wx/video_view.h @@ -22,8 +22,10 @@ #define DCPOMATIC_VIDEO_VIEW_H #include "lib/dcpomatic_time.h" +#include "lib/timer.h" #include #include +#include class Image; class wxWindow; @@ -33,21 +35,19 @@ class PlayerVideo; class VideoView { public: - VideoView (FilmViewer* viewer) - : _viewer (viewer) -#ifdef DCPOMATIC_VARIANT_SWAROOP - , _in_watermark (false) -#endif - {} - + VideoView (FilmViewer* viewer); virtual ~VideoView () {} virtual void set_image (boost::shared_ptr image) = 0; virtual wxWindow* get () const = 0; + /** Redraw the view after something has changed like content outlining, + * the film being removed, etc. + */ virtual void update () = 0; + virtual void start (); /* XXX_b: make pure */ - virtual void start () {} + virtual void stop () {} void clear (); @@ -58,24 +58,78 @@ public: /* XXX_b: to remove */ virtual void display_player_video () {} + int dropped () const { + boost::mutex::scoped_lock lm (_mutex); + return _dropped; + } + + StateTimer const & state_timer () const { + return _state_timer; + } + dcpomatic::DCPTime position () const { + boost::mutex::scoped_lock lm (_mutex); return _player_video.second; } + void set_video_frame_rate (int r) { + boost::mutex::scoped_lock lm (_mutex); + _video_frame_rate = r; + } + + void set_length (dcpomatic::DCPTime len) { + boost::mutex::scoped_lock lm (_mutex); + _length = len; + } + protected: /* XXX_b: to remove */ friend class FilmViewer; bool get_next_frame (bool non_blocking); + int time_until_next_frame () const; + dcpomatic::DCPTime one_video_frame () const; + + int video_frame_rate () const { + boost::mutex::scoped_lock lm (_mutex); + return _video_frame_rate; + } + + dcpomatic::DCPTime length () const { + boost::mutex::scoped_lock lm (_mutex); + return _length; + } + + std::pair, dcpomatic::DCPTime> player_video () const { + boost::mutex::scoped_lock lm (_mutex); + return _player_video; + } + + void add_dropped () { + boost::mutex::scoped_lock lm (_mutex); + ++_dropped; + } FilmViewer* _viewer; - std::pair, dcpomatic::DCPTime> _player_video; #ifdef DCPOMATIC_VARIANT_SWAROOP bool _in_watermark; int _watermark_x; int _watermark_y; #endif + + StateTimer _state_timer; + +private: + /** Mutex protecting all the state in VideoView */ + mutable boost::mutex _mutex; + + std::pair, dcpomatic::DCPTime> _player_video; + int _video_frame_rate; + /** length of the film we are playing, or 0 if there is none */ + dcpomatic::DCPTime _length; + + int _dropped; }; #endif