Considerable rework of decoder timing; tests pass, at least.

1 files changed, 29 insertions, 0 deletions

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 3f4cda6eb..18c5acd35 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -36,3 +36,32 @@ Decoder::Decoder (shared_ptr<const Film> f)
 {
 
 }
+
+shared_ptr<Decoded>
+Decoder::peek ()
+{
+	while (_pending.empty () && !pass ()) {}
+
+	if (_pending.empty ()) {
+		return shared_ptr<Decoded> ();
+	}
+
+	return _pending.front ();
+}
+
+shared_ptr<Decoded>
+Decoder::get ()
+{
+	shared_ptr<Decoded> d = peek ();
+	if (d) {
+		_pending.pop_front ();
+	}
+
+	return d;
+}
+
+void
+Decoder::seek (ContentTime, bool)
+{
+	_pending.clear ();
+}