X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fstring_text_file_decoder.cc;h=f24147851847e1ee120354984f2dbd40f20630a7;hb=2e2f11b29651cffe37c64275dbd45c7563310020;hp=a81f2592da4ff36797694c596f267f30d8637beb;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc
index a81f2592d..f24147851 100644
--- a/src/lib/string_text_file_decoder.cc
+++ b/src/lib/string_text_file_decoder.cc
@@ -23,7 +23,6 @@
 #include "text_content.h"
 #include "text_decoder.h"
 #include <dcp/subtitle_string.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::list;
@@ -31,19 +30,21 @@ using std::vector;
 using std::string;
 using std::cout;
 using std::max;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+using namespace dcpomatic;
 
-StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const StringTextFileContent> content, shared_ptr<Log> log)
-	: StringTextFile (content)
+StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, shared_ptr<const StringTextFileContent> content)
+	: Decoder (film)
+	, StringTextFile (content)
 	, _next (0)
 {
 	ContentTime first;
 	if (!_subtitles.empty()) {
 		first = content_time_period(_subtitles[0]).from;
 	}
-	caption.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_caption(), log, first)));
+	text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
 }
 
 void
@@ -73,7 +74,7 @@ StringTextFileDecoder::pass ()
 	}
 
 	ContentTimePeriod const p = content_time_period (_subtitles[_next]);
-	only_caption()->emit_plain (p, _subtitles[_next]);
+	only_text()->emit_plain (p, _subtitles[_next]);
 
 	++_next;
 	return false;
@@ -87,3 +88,17 @@ StringTextFileDecoder::content_time_period (sub::Subtitle s) const
 		ContentTime::from_seconds (s.to.all_as_seconds())
 		);
 }
+
+
+vector<FontData>
+StringTextFileDecoder::fonts () const
+{
+	vector<FontData> data;
+	for (auto i: text) {
+		for (auto j: i->content()->fonts()) {
+			data.push_back (FontData(j));
+		}
+	}
+	return data;
+}
+