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

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 024d62f34..169a41751 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -21,6 +21,8 @@
 
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
+#include "font.h"
+#include "text_content.h"
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/load_font_node.h>
 #include <iostream>
@@ -28,20 +30,19 @@
 
 using std::cout;
 using std::list;
-using std::map;
 using std::string;
 using std::vector;
 using std::shared_ptr;
 using std::dynamic_pointer_cast;
 using std::make_shared;
-using boost::bind;
 using namespace dcpomatic;
 
 
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
 	: Decoder (film)
 {
-	auto c = load (content->path(0));
+	/* Load the XML or MXF file */
+	shared_ptr<dcp::SubtitleAsset> const c = load (content->path(0));
 	c->fix_empty_font_ids ();
 	_subtitles = c->subtitles ();
 	_next = _subtitles.begin ();
@@ -52,14 +53,39 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<
 	}
 	text.push_back (make_shared<TextDecoder>(this, content->only_text(), first));
 
-	auto fm = c->font_data();
-	for (auto const& i: fm) {
-		_fonts.push_back (FontData(i.first, i.second));
+	/* 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();
 
-	/* Add a default font for any LoadFont nodes in our file which we haven't yet found fonts for */
+	/* Find a font for each <LoadFont> Node */
 	for (auto i: c->load_font_nodes()) {
-		if (fm.find(i->id) == fm.end()) {
+		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())));
 		}
 	}