summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-05-08 14:39:46 +0100
committerCarl Hetherington <cth@carlh.net>2017-05-08 14:39:46 +0100
commit97632e5e91fc0e2c0a3dd84ed9a167f79e4bd14d (patch)
treeac8bc4c05ef78c4b0df460e707789ff25675548a /src/lib/player.h
parentd02e03907214808ce9da9eb9a2267ff577e85559 (diff)
Fix up black-filling logic.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index 7cffa1f11..ffc578c71 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -110,7 +110,6 @@ private:
void subtitle_stop (boost::weak_ptr<Piece>, ContentTime);
boost::shared_ptr<Resampler> resampler (boost::shared_ptr<const AudioContent> content, AudioStreamPtr stream, bool create);
DCPTime one_video_frame () const;
- bool fill_video (DCPTimePeriod period);
void fill_audio (DCPTimePeriod period);
void audio_flush (boost::shared_ptr<Piece>, AudioStreamPtr stream);
void audio_transform (boost::shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time);
@@ -146,11 +145,12 @@ private:
/** Last PlayerVideo that was emitted */
boost::shared_ptr<PlayerVideo> _last_video;
- /** Time just after the last video frame we emitted, or the last seek time */
+ /** Time just after the last video frame we emitted, or empty if we have just seeked */
boost::optional<DCPTime> _last_video_time;
- /** Time just after the last audio frame we emitted, or the last seek time */
+ /** Time just after the last audio frame we emitted, or empty if we have just seeked */
boost::optional<DCPTime> _last_audio_time;
boost::optional<DCPTime> _last_seek_time;
+ bool _last_seek_accurate;
AudioMerger _audio_merger;