diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-06-01 13:03:38 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-06-07 17:01:06 +0200 |
| commit | 5a820bb8fae34591be5ac6d19a73461b9dab532a (patch) | |
| tree | 098e2dc959b6df0fefa62b2976976afc9f81b96b /src/lib/dcp_decoder.cc | |
| parent | 9a7b67aee32a40539f29bc2d7017edd4a4f65f11 (diff) | |
Rearrange subtitle font management.
With this change each subtitle coming out of the player has a reference
to a dcpomatic::Font that belongs to the TextContent. This hopefully
solves a few problems which all basically stemmed from the fact that
previously the decoders/player were deciding what the font ID in the
output DCP would be - they can't do that properly.
Diffstat (limited to 'src/lib/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index dfbef3406..636cc8ed2 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -502,18 +502,3 @@ DCPDecoder::position () const return ContentTime::from_frames(_offset, _dcp_content->active_video_frame_rate(film())) + _next; } - -vector<FontData> -DCPDecoder::fonts () const -{ - vector<FontData> data; - for (auto i: _reels) { - if (i->main_subtitle() && i->main_subtitle()->asset()) { - for (auto const& j: i->main_subtitle()->asset()->font_data()) { - data.push_back (FontData(j.first, j.second)); - } - } - } - return data; -} - |