X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=7f4973737faff0146f971f91c846cc4c8a5dabef;hb=64dc289b343641fc37db51fcd6b3069078cb5edf;hp=50770834586f10c1cb5405d7846fa2696d26fd66;hpb=1f2bc4d8f3601ad1e12b94f37b3889fcd003509b;p=dcpomatic.git

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 507708345..7f4973737 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -21,44 +21,54 @@
  *  @brief Parent class for decoders of content.
  */
 
-#include <iostream>
-#include <stdint.h>
-#include <boost/lexical_cast.hpp>
 #include "film.h"
-#include "format.h"
-#include "job.h"
-#include "options.h"
-#include "exceptions.h"
-#include "image.h"
-#include "util.h"
-#include "log.h"
 #include "decoder.h"
-#include "delay_line.h"
-#include "subtitle.h"
-#include "filter_graph.h"
-
-using std::string;
-using std::stringstream;
-using std::min;
-using std::pair;
-using std::list;
+#include "decoded.h"
+
+#include "i18n.h"
+
 using boost::shared_ptr;
-using boost::optional;
 
 /** @param f Film.
- *  @param o Options.
- *  @param j Job that we are running within, or 0
+ *  @param o Decode options.
  */
-Decoder::Decoder (boost::shared_ptr<Film> f, boost::shared_ptr<const DecodeOptions> o, Job* j)
+Decoder::Decoder (shared_ptr<const Film> f)
 	: _film (f)
-	, _opt (o)
-	, _job (j)
 {
-	
+
+}
+
+class DecodedSorter
+{
+public:
+	bool operator() (shared_ptr<Decoded> a, shared_ptr<Decoded> b)
+	{
+		return a->dcp_time < b->dcp_time;
+	}
+};
+
+shared_ptr<Decoded>
+Decoder::peek ()
+{
+	while (_pending.empty() && !pass ()) {}
+
+	if (_pending.empty ()) {
+		return shared_ptr<Decoded> ();
+	}
+
+	return _pending.front ();
+}
+
+void
+Decoder::consume ()
+{
+	if (!_pending.empty ()) {
+		_pending.pop_front ();
+	}
 }
 
-bool
-Decoder::seek (SourceFrame f)
+void
+Decoder::seek (ContentTime, bool)
 {
-	throw DecodeError ("decoder does not support seek");
+	_pending.clear ();
 }