diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-20 23:41:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-22 02:37:53 +0100 |
| commit | ddcd4f3ba0af3e9d49dbb68127317cd0d871a248 (patch) | |
| tree | 1091683b8dcaf82cd517b844be1d76f290f88f50 /src/lib/string_text_file_decoder.cc | |
| parent | bf4446523dd891049cabf1bcd68d20def57bc731 (diff) | |
Pass fonts from content around as FontData.
i.e. as a block of memory rather than a file. Also, get the
fonts from the decoder rather than the content.
Together, these changes allow us to use fonts from SMPTE DCPs
added as content. Before, fonts would be messed up in those
cases (#1885).
Diffstat (limited to 'src/lib/string_text_file_decoder.cc')
| -rw-r--r-- | src/lib/string_text_file_decoder.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc index 4cf34a3a9..691734d7b 100644 --- a/src/lib/string_text_file_decoder.cc +++ b/src/lib/string_text_file_decoder.cc @@ -89,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; +} + |