summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-02-13 15:32:16 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commitb800a9051f068b4b11a08248601bc7099e79807f (patch)
tree7287c651f1f0041806a025193273ab8dcf8bbe75 /src/lib/player.h
parent26807fe95fb7fbf0e5e6a8e32ab35068712ef058 (diff)
Fix bug in gap-filling; rename _last_video_time -> _last_time.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index 05e994d0b..ba7845b54 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -130,8 +130,10 @@ private:
/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
bool _play_referenced;
+ /** Last PlayerVideo that was emitted */
boost::shared_ptr<PlayerVideo> _last_video;
- boost::optional<DCPTime> _last_video_time;
+ /** Time of the last thing we emitted, or the last seek time */
+ boost::optional<DCPTime> _last_time;
AudioMerger _audio_merger;
DCPTime _last_audio_time;