Move _state_timer into VideoView.

[dcpomatic.git] / src / wx / video_view.h

diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 06067130c5a330d64a103b4bd47f0ac75eac514f..4a94aa879bf4bc3beddf093b50c7ea8dc7eee3be 100644 (file)
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -22,6 +22,7 @@
 #define DCPOMATIC_VIDEO_VIEW_H
 
 #include "lib/dcpomatic_time.h"
+#include "lib/timer.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
@@ -34,22 +35,17 @@ class PlayerVideo;
 class VideoView
 {
 public:
-       VideoView (FilmViewer* viewer)
-               : _viewer (viewer)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-               , _in_watermark (false)
-#endif
-               , _video_frame_rate (0)
-       {}
-
+       VideoView (FilmViewer* viewer);
        virtual ~VideoView () {}
 
        virtual void set_image (boost::shared_ptr<const Image> 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;
 
-       /* XXX_b: make pure */
-       virtual void start () {}
+       virtual void start ();
        /* XXX_b: make pure */
        virtual void stop () {}
 
@@ -62,6 +58,15 @@ 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;
@@ -84,20 +89,28 @@ protected:
        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;
        }
 
-       FilmViewer* _viewer;
-       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
+       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> player_video () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _player_video;
+       }
 
-       /** Mutex protecting all the state in VideoView */
-       mutable boost::mutex _mutex;
+       void add_dropped () {
+               boost::mutex::scoped_lock lm (_mutex);
+               ++_dropped;
+       }
+
+       FilmViewer* _viewer;
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        bool _in_watermark;
@@ -105,9 +118,18 @@ protected:
        int _watermark_y;
 #endif
 
+       StateTimer _state_timer;
+
 private:
+       /** Mutex protecting all the state in VideoView */
+       mutable boost::mutex _mutex;
+
+       std::pair<boost::shared_ptr<PlayerVideo>, 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