X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=0901f73b020027cc733ab325c2085f494db65d45;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=082ad5076cd402647f43800596f45614319616f6;hpb=f861018389acd9d277fe34d7621182b9b54f977f;p=dcpomatic.git

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 082ad5076..0901f73b0 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -21,31 +21,56 @@
  *  @brief Parent class for decoders of content.
  */
 
-#include <iostream>
-#include "film.h"
-#include "exceptions.h"
-#include "util.h"
 #include "decoder.h"
+#include "decoded.h"
 
 #include "i18n.h"
 
-using std::string;
+using std::cout;
 using boost::shared_ptr;
 
-/** @param f Film.
- *  @param o Decode options.
+/** @param o Decode options.
  */
-Decoder::Decoder (shared_ptr<const Film> f)
-	: _film (f)
+Decoder::Decoder ()
+	: _done (false)
 {
-	_film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
+
 }
 
-/** Seek to a position as a content timestamp in seconds.
- *  @return true on error.
- */
-bool
-Decoder::seek (double)
+struct DecodedSorter
+{
+	bool operator() (shared_ptr<Decoded> a, shared_ptr<Decoded> b)
+	{
+		return a->dcp_time < b->dcp_time;
+	}
+};
+
+shared_ptr<Decoded>
+Decoder::peek ()
+{
+	while (!_done && _pending.empty ()) {
+		_done = pass ();
+	}
+
+	if (_done && _pending.empty ()) {
+		return shared_ptr<Decoded> ();
+	}
+
+	_pending.sort (DecodedSorter ());
+	return _pending.front ();
+}
+
+void
+Decoder::consume ()
+{
+	if (!_pending.empty ()) {
+		_pending.pop_front ();
+	}
+}
+
+void
+Decoder::seek (ContentTime, bool)
 {
-	throw DecodeError (N_("decoder does not support seek"));
+	_pending.clear ();
+	_done = false;
 }