X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=fb7663f5ca8833caadcd02cd46034b8733f07491;hp=785fb96f0c2ed4b0b7637abba296bcbb61ca40b1;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hpb=de2af791bdfdcd653752cba970e59efc7bf810c7

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 785fb96f0..fb7663f5c 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,24 +21,57 @@
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "subtitle_decoder.h"
+#include "text_decoder.h"
+#include <boost/optional.hpp>
+#include <iostream>
 
+using std::cout;
+using boost::optional;
+using boost::shared_ptr;
+
+/** @return Earliest time of content that the next pass() will emit */
 ContentTime
-Decoder::position () const
+Decoder::position (shared_ptr<const Film> film) const
 {
-	ContentTime pos;
+	optional<ContentTime> pos;
 
-	if (video && video->position()) {
-		pos = min (pos, video->position().get());
+	if (video && !video->ignore() && (!pos || video->position(film) < *pos)) {
+		pos = video->position(film);
 	}
 
-	if (audio && audio->position()) {
-		pos = min (pos, audio->position().get());
+	if (audio && !audio->ignore() && (!pos || audio->position(film) < *pos)) {
+		pos = audio->position(film);
 	}
 
-	if (subtitle && subtitle->position()) {
-		pos = min (pos, subtitle->position().get());
+	BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+		if (!i->ignore() && (!pos || i->position(film) < *pos)) {
+			pos = i->position(film);
+		}
 	}
 
-	return pos;
+	return pos.get_value_or(ContentTime());
+}
+
+void
+Decoder::seek (shared_ptr<const Film>, ContentTime, bool)
+{
+	if (video) {
+		video->seek ();
+	}
+	if (audio) {
+		audio->seek ();
+	}
+	BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+		i->seek ();
+	}
+}
+
+shared_ptr<TextDecoder>
+Decoder::only_text () const
+{
+	DCPOMATIC_ASSERT (text.size() < 2);
+	if (text.empty ()) {
+		return shared_ptr<TextDecoder> ();
+	}
+	return text.front ();
 }