From 97632e5e91fc0e2c0a3dd84ed9a167f79e4bd14d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 May 2017 14:39:46 +0100 Subject: Fix up black-filling logic. --- src/lib/player.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/player.h') 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, ContentTime); boost::shared_ptr resampler (boost::shared_ptr 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, AudioStreamPtr stream); void audio_transform (boost::shared_ptr content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time); @@ -146,11 +145,12 @@ private: /** Last PlayerVideo that was emitted */ boost::shared_ptr _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 _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 _last_audio_time; boost::optional _last_seek_time; + bool _last_seek_accurate; AudioMerger _audio_merger; -- cgit v1.2.3