X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=52e8c04e6984f26d389d74ec61189fa80f749a69;hb=4285355ff2bec853924647f0523d121860fe64e3;hp=114e2ebb4c509b5c52fa975a66ba1907021a1882;hpb=936ff6927ad24daf0ed20776b19b6faa3df9bf83;p=dcpomatic.git

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 114e2ebb4..52e8c04e6 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,19 +19,75 @@
 */
 
 #include "decoder.h"
-#include "decoder_part.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "text_decoder.h"
+#include <boost/optional.hpp>
 #include <iostream>
 
 using std::cout;
 using boost::optional;
+using boost::shared_ptr;
+using boost::weak_ptr;
+
+Decoder::Decoder (weak_ptr<const Film> film)
+	: _film (film)
+{
+
+}
+
+/** @return Earliest time of content that the next pass() will emit */
+ContentTime
+Decoder::position () const
+{
+	optional<ContentTime> pos;
+	shared_ptr<const Film> f = film();
+
+	if (video && !video->ignore() && (!pos || video->position(f) < *pos)) {
+		pos = video->position(f);
+	}
+
+	if (audio && !audio->ignore() && (!pos || audio->position(f) < *pos)) {
+		pos = audio->position(f);
+	}
+
+	BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+		if (!i->ignore() && (!pos || i->position(f) < *pos)) {
+			pos = i->position(f);
+		}
+	}
+
+	return pos.get_value_or(ContentTime());
+}
 
 void
-Decoder::maybe_seek (optional<ContentTime> position, ContentTime time, bool accurate)
+Decoder::seek (ContentTime, bool)
 {
-	if (position && (time >= position.get() && time < (position.get() + ContentTime::from_seconds(1)))) {
-		/* No need to seek: caller should just pass() */
-		return;
+	if (video) {
+		video->seek ();
 	}
+	if (audio) {
+		audio->seek ();
+	}
+	BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+		i->seek ();
+	}
+}
 
-	seek (time, accurate);
+shared_ptr<TextDecoder>
+Decoder::only_text () const
+{
+	DCPOMATIC_ASSERT (text.size() < 2);
+	if (text.empty ()) {
+		return shared_ptr<TextDecoder> ();
+	}
+	return text.front ();
+}
+
+shared_ptr<const Film>
+Decoder::film () const
+{
+	shared_ptr<const Film> f = _film.lock ();
+	DCPOMATIC_ASSERT (f);
+	return f;
 }