summaryrefslogtreecommitdiff
path: root/src/wx/video_view.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-11-20 23:07:55 +0100
committerCarl Hetherington <cth@carlh.net>2020-01-08 21:56:47 +0100
commit5aff601c454fa756c0ab71ae4bcf8f7f4ce28737 (patch)
treed453bc6c8e37ba2c2601a477c3d314a86721d62c /src/wx/video_view.h
parent7da4fe1c2de3c184a22dbcd1195fc6cffb83ac51 (diff)
Move _dropped into VideoView.
Diffstat (limited to 'src/wx/video_view.h')
-rw-r--r--src/wx/video_view.h24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 656d8621e..8d9dce68d 100644
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -34,14 +34,7 @@ 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;
@@ -51,8 +44,7 @@ public:
*/
virtual void update () = 0;
- /* XXX_b: make pure */
- virtual void start () {}
+ virtual void start ();
/* XXX_b: make pure */
virtual void stop () {}
@@ -65,6 +57,11 @@ public:
/* XXX_b: to remove */
virtual void display_player_video () {}
+ int dropped () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _dropped;
+ }
+
dcpomatic::DCPTime position () const {
boost::mutex::scoped_lock lm (_mutex);
return _player_video.second;
@@ -103,6 +100,11 @@ protected:
return _player_video;
}
+ void add_dropped () {
+ boost::mutex::scoped_lock lm (_mutex);
+ ++_dropped;
+ }
+
FilmViewer* _viewer;
#ifdef DCPOMATIC_VARIANT_SWAROOP
@@ -119,6 +121,8 @@ private:
int _video_frame_rate;
/** length of the film we are playing, or 0 if there is none */
dcpomatic::DCPTime _length;
+
+ int _dropped;
};
#endif