X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=711dc77f263e6cf7d2d64ba40bc877f33a6a761d;hb=a75cac36969942d1fcb43dadfdf60434c840af54;hp=024d62f3424f3138f2f84f190e5f99119d4a8984;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 024d62f34..711dc77f2 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -19,50 +19,46 @@
 */
 
 
-#include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
+#include "dcp_subtitle_decoder.h"
+#include "film.h"
+#include "font.h"
+#include "text_content.h"
+#include "util.h"
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/load_font_node.h>
-#include <iostream>
 
 
-using std::cout;
+using std::dynamic_pointer_cast;
 using std::list;
-using std::map;
+using std::make_shared;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using std::shared_ptr;
-using std::dynamic_pointer_cast;
-using std::make_shared;
-using boost::bind;
+using boost::optional;
 using namespace dcpomatic;
 
 
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
 	: Decoder (film)
 {
-	auto c = load (content->path(0));
-	c->fix_empty_font_ids ();
-	_subtitles = c->subtitles ();
+	/* Load the XML or MXF file */
+	_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));
+	_subtitle_standard = _asset->subtitle_standard();
 
-	auto fm = c->font_data();
-	for (auto const& i: fm) {
-		_fonts.push_back (FontData(i.first, i.second));
-	}
+	text.push_back (make_shared<TextDecoder>(this, content->only_text()));
+	update_position();
 
-	/* Add a default font for any LoadFont nodes in our file which we haven't yet found fonts for */
-	for (auto i: c->load_font_nodes()) {
-		if (fm.find(i->id) == fm.end()) {
-			_fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file())));
-		}
+	FontIDAllocator font_id_allocator;
+
+	for (auto node: _asset->load_font_nodes()) {
+		_font_id_allocator.add_font(0, _asset->id(), node->id);
 	}
+	_font_id_allocator.allocate();
 }
 
 
@@ -76,6 +72,8 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 	while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
 		++i;
 	}
+
+	update_position();
 }
 
 
@@ -93,14 +91,20 @@ DCPSubtitleDecoder::pass ()
 	   time of emitting the first.
 	*/
 
-	list<dcp::SubtitleString> s;
-	list<dcp::SubtitleImage> i;
+	vector<dcp::SubtitleString> s;
+	vector<dcp::SubtitleImage> i;
 	auto const p = content_time_period (*_next);
 
 	while (_next != _subtitles.end () && content_time_period (*_next) == p) {
 		auto ns = dynamic_pointer_cast<const dcp::SubtitleString>(*_next);
 		if (ns) {
-			s.push_back (*ns);
+			dcp::SubtitleString ns_copy = *ns;
+			if (ns_copy.font()) {
+				ns_copy.set_font(_font_id_allocator.font_id(0, _asset->id(), ns_copy.font().get()));
+			} else {
+				ns_copy.set_font(_font_id_allocator.default_font_id());
+			}
+			s.push_back(ns_copy);
 			++_next;
 		} else {
 			/* XXX: perhaps these image subs should also be collected together like the string ones are;
@@ -115,7 +119,10 @@ DCPSubtitleDecoder::pass ()
 		}
 	}
 
-	only_text()->emit_plain (p, s);
+	only_text()->emit_plain(p, s, _subtitle_standard);
+
+	update_position();
+
 	return false;
 }
 
@@ -130,9 +137,25 @@ DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) cons
 }
 
 
-vector<dcpomatic::FontData>
-DCPSubtitleDecoder::fonts () const
+/** @return time of first subtitle, if there is one */
+optional<ContentTime>
+DCPSubtitleDecoder::first () const
 {
-	return _fonts;
+	if (_subtitles.empty()) {
+		return {};
+	}
+
+	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())
+			);
+	}
 }