From f113b2aaca7a65f7b37e12a7d9f3f99e2d834e81 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 19 Nov 2016 20:40:36 +0000 Subject: Move position variables into the video/audio/subtitle decoder classes. --- src/lib/decoder.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/lib/decoder.h') diff --git a/src/lib/decoder.h b/src/lib/decoder.h index d2302d7a2..bd4bf01c2 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -52,10 +52,6 @@ public: PASS_REASON_SUBTITLE }; - void maybe_seek_video (ContentTime time, bool accurate); - void maybe_seek_audio (ContentTime time, bool accurate); - void maybe_seek_subtitle (ContentTime time, bool accurate); - /** @return true if this decoder has already returned all its data and will give no more */ virtual bool pass (PassReason, bool accurate) = 0; @@ -64,10 +60,7 @@ public: */ virtual void reset () {} -protected: - boost::optional _video_position; - boost::optional _audio_position; - boost::optional _subtitle_position; + void maybe_seek (boost::optional& position, ContentTime time, bool accurate); private: /** Seek so that the next pass() will yield the next thing @@ -79,7 +72,6 @@ private: * it may seek to just the right spot. */ virtual void seek (ContentTime time, bool accurate) = 0; - void maybe_seek (boost::optional& position, ContentTime time, bool accurate); }; #endif -- cgit v1.2.3