Pass fonts from content around as FontData.

[dcpomatic.git] / src / lib / string_text_file_decoder.cc

diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc
index 8286c1e391d0c3a2e441d16b02c02fb596c6a254..691734d7bbf11d1d218efa139dc3eb01b44c6e2d 100644 (file)
--- a/src/lib/string_text_file_decoder.cc
+++ b/src/lib/string_text_file_decoder.cc
@@ -34,16 +34,18 @@ using std::max;
 using boost::shared_ptr;
 using boost::optional;
 using boost::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;
        }
-       text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), log, first)));
+       text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
 }
 
 void
@@ -87,3 +89,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;
+       BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+               BOOST_FOREACH (shared_ptr<Font> j, i->content()->fonts()) {
+                       data.push_back (FontData(j));
+               }
+       }
+       return data;
+}
+