summaryrefslogtreecommitdiff
path: root/src/lib/decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-11-19 20:40:36 +0000
committerCarl Hetherington <cth@carlh.net>2016-11-19 20:40:36 +0000
commitf113b2aaca7a65f7b37e12a7d9f3f99e2d834e81 (patch)
tree6ea2ed1d480304a4aaf512e380cd013bbf42e86c /src/lib/decoder.h
parentfab7fa5a9ef1d069c7ca32e3669d0e37e896250c (diff)
Move position variables into the video/audio/subtitle decoder classes.
Diffstat (limited to 'src/lib/decoder.h')
-rw-r--r--src/lib/decoder.h10
1 files changed, 1 insertions, 9 deletions
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<ContentTime> _video_position;
- boost::optional<ContentTime> _audio_position;
- boost::optional<ContentTime> _subtitle_position;
+ void maybe_seek (boost::optional<ContentTime>& 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<ContentTime>& position, ContentTime time, bool accurate);
};
#endif