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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 70eb5b61a..52e8c04e6 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -21,29 +21,40 @@
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "caption_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() < *pos)) {
-		pos = video->position();
+	if (video && !video->ignore() && (!pos || video->position(f) < *pos)) {
+		pos = video->position(f);
 	}
 
-	if (audio && !audio->ignore() && (!pos || audio->position() < *pos)) {
-		pos = audio->position();
+	if (audio && !audio->ignore() && (!pos || audio->position(f) < *pos)) {
+		pos = audio->position(f);
 	}
 
-	if (caption && !caption->ignore() && (!pos || caption->position() < *pos)) {
-		pos = caption->position();
+	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());
@@ -58,7 +69,25 @@ Decoder::seek (ContentTime, bool)
 	if (audio) {
 		audio->seek ();
 	}
-	if (caption) {
-		caption->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 ();
+}
+
+shared_ptr<const Film>
+Decoder::film () const
+{
+	shared_ptr<const Film> f = _film.lock ();
+	DCPOMATIC_ASSERT (f);
+	return f;
+}