X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=08c2bf7ec3642a86f687d9d4d24e6f7cbeaa663c;hb=e7efb7d651d4555ed8dd2b3c4980b5222d1e0521;hp=940c8c75a3c6c2513dbe2b98fddb5f29f5fc54b1;hpb=2975fa5cd5dcfaa806b07ef39c8900e07f417658;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 940c8c75a..08c2bf7ec 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -41,53 +41,13 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<
 	: Decoder (film)
 {
 	/* Load the XML or MXF file */
-	auto const c = load (content->path(0));
-	c->fix_empty_font_ids ();
-	_subtitles = c->subtitles ();
+	auto const asset = load (content->path(0));
+	asset->fix_empty_font_ids ();
+	_subtitles = asset->subtitles ();
 	_next = _subtitles.begin ();
 
-	ContentTime first;
-	if (_next != _subtitles.end()) {
-		first = content_time_period(*_next).from;
-	}
-	text.push_back (make_shared<TextDecoder>(this, content->only_text(), first));
-
-	/* The fonts that are included in content's file; if it's interop there will be none
-	 * (as the fonts are held in separate assets).
-	 */
-	auto fonts_in_asset = c->font_data();
-
-	/* Fonts specified in the TextContent */
-	list<shared_ptr<dcpomatic::Font>> fonts_in_content;
-	for (auto i: content->text) {
-		auto this_fonts = i->fonts();
-		std::copy(this_fonts.begin(), this_fonts.end(), std::back_inserter(fonts_in_content));
-	}
-	fonts_in_content.sort();
-	fonts_in_content.unique();
-
-	/* Find a font for each <LoadFont> Node */
-	for (auto i: c->load_font_nodes()) {
-		bool done = false;
-		for (auto j: fonts_in_content) {
-			if (j->id() == i->id && j->file()) {
-				// One was specified in the content
-				_fonts.push_back (FontData(i->id, dcp::ArrayData(*j->file())));
-				done = true;
-			}
-		}
-		if (!done) {
-			if (fonts_in_asset.find(i->id) != fonts_in_asset.end()) {
-				// One was included in the subtitle file
-				_fonts.push_back (FontData(i->id, fonts_in_asset[i->id]));
-				done = true;
-			}
-		}
-		if (!done) {
-			// Give up and add a default
-			_fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file())));
-		}
-	}
+	text.push_back (make_shared<TextDecoder>(this, content->only_text()));
+	update_position();
 }
 
 
@@ -101,6 +61,8 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 	while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
 		++i;
 	}
+
+	update_position();
 }
 
 
@@ -141,6 +103,9 @@ DCPSubtitleDecoder::pass ()
 	}
 
 	only_text()->emit_plain (p, s);
+
+	update_position();
+
 	return false;
 }
 
@@ -155,13 +120,6 @@ DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) cons
 }
 
 
-vector<dcpomatic::FontData>
-DCPSubtitleDecoder::fonts () const
-{
-	return _fonts;
-}
-
-
 /** @return time of first subtitle, if there is one */
 optional<ContentTime>
 DCPSubtitleDecoder::first () const
@@ -172,3 +130,15 @@ DCPSubtitleDecoder::first () const
 
 	return ContentTime::from_seconds(_subtitles[0]->in().as_seconds());
 }
+
+
+void
+DCPSubtitleDecoder::update_position()
+{
+	if (_next != _subtitles.end()) {
+		only_text()->maybe_set_position(
+			ContentTime::from_seconds((*_next)->in().as_seconds())
+			);
+	}
+}
+