summaryrefslogtreecommitdiff
path: root/src/lib/decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-25 09:41:36 +0000
committerCarl Hetherington <cth@carlh.net>2014-03-25 09:41:36 +0000
commitee77b3cf5f59f775e75e628aa28e8f2f9f941530 (patch)
treebbf9ab4ef1f0f633591889cbbd6b7b65de8f5a57 /src/lib/decoder.h
parente6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160 (diff)
It builds.
Diffstat (limited to 'src/lib/decoder.h')
-rw-r--r--src/lib/decoder.h25
1 files changed, 3 insertions, 22 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 0f14dbba7..df3ac4f39 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -31,6 +31,7 @@
#include "dcpomatic_time.h"
class Decoded;
+class Film;
/** @class Decoder.
* @brief Parent class for decoders of content.
@@ -38,36 +39,16 @@ class Decoded;
class Decoder : public boost::noncopyable
{
public:
- Decoder ();
virtual ~Decoder () {}
+protected:
/** Seek so that the next peek() will yield the next thing
* (video/sound frame, subtitle etc.) at or after the requested
* time. Pass accurate = true to try harder to get close to
* the request.
*/
- virtual void seek (ContentTime time, bool accurate);
-
- boost::shared_ptr<Decoded> peek ();
-
- /* Consume the last peek()ed thing so that it won't be returned
- * from the next peek().
- */
- void consume ();
-
-protected:
-
- /** Perform one decode pass of the content, which may or may not
- * result in a complete quantum (Decoded object) of decoded stuff
- * being added to _pending.
- * @return true if the decoder is done (i.e. no more data will be
- * produced by any future calls to pass() without a seek() first).
- */
+ virtual void seek (ContentTime time, bool accurate) = 0;
virtual bool pass () = 0;
- virtual void flush () {};
-
- std::list<boost::shared_ptr<Decoded> > _pending;
- bool _done;
};
#endif