From de2af791bdfdcd653752cba970e59efc7bf810c7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Nov 2016 16:57:15 +0000 Subject: Basic grunt-work, untested and unfinished, but it compiles. --- src/lib/decoder.h | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to 'src/lib/decoder.h') diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 3717d931d..f70eca8b3 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington This file is part of DCP-o-matic. @@ -47,32 +47,10 @@ public: boost::shared_ptr audio; boost::shared_ptr subtitle; - enum PassReason { - PASS_REASON_VIDEO, - PASS_REASON_AUDIO, - PASS_REASON_SUBTITLE - }; - - /** @return true if this decoder has already returned all its data and will give no more */ - virtual bool pass (PassReason, bool accurate) = 0; - - /** Ensure that any future get() calls return data that reflect - * changes in our content's settings. - */ - virtual void reset () {} - - void maybe_seek (boost::optional position, ContentTime time, bool accurate); - -private: - /** Seek so that the next pass() will yield the next thing - * (video/sound frame, subtitle etc.) at or after the requested - * time. Pass accurate = true to try harder to ensure that, at worst, - * the next thing we yield comes before `time'. This may entail - * seeking some way before `time' to be on the safe side. - * Alternatively, if seeking is 100% accurate for this decoder, - * it may seek to just the right spot. - */ + virtual void pass () = 0; virtual void seek (ContentTime time, bool accurate) = 0; + + ContentTime position () const; }; #endif -- cgit v1.2.3