X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=8908d34e6d49a4b5d18f6fb631d55a15f6dbc7a9;hb=refs%2Fheads%2F2404-assertion;hp=858849ca3134f003803abbfcad881dcb890c1d8e;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 858849ca3..8908d34e6 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -48,7 +48,8 @@ DCPSubtitleContent::DCPSubtitleContent (cxml::ConstNodePtr node, int version)
 	: Content (node)
 	, _length (node->number_child<ContentTime::Type> ("Length"))
 {
-	text = TextContent::from_xml (this, node, version);
+	list<string> notes;
+	text = TextContent::from_xml (this, node, version, notes);
 }
 
 void
@@ -61,7 +62,7 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 	auto iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(sc);
 	auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(sc);
 	if (smpte) {
-		set_video_frame_rate (smpte->edit_rate().numerator);
+		set_video_frame_rate(film, smpte->edit_rate().numerator);
 	}
 
 	boost::mutex::scoped_lock lm (_mutex);
@@ -73,8 +74,18 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 
 	sc->fix_empty_font_ids ();
 
-	for (auto i: sc->load_font_nodes()) {
-		only_text()->add_font(make_shared<Font>(i->id));
+	auto font_data = sc->font_data();
+	for (auto node: sc->load_font_nodes()) {
+		auto data = font_data.find(node->id);
+		if (data != font_data.end()) {
+			only_text()->add_font(make_shared<Font>(node->id, data->second));
+		} else {
+			only_text()->add_font(make_shared<Font>(node->id));
+		}
+	}
+
+	if (only_text()->fonts().empty()) {
+		only_text()->add_font(make_shared<Font>(""));
 	}
 }