From 5a820bb8fae34591be5ac6d19a73461b9dab532a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 1 Jun 2022 13:03:38 +0200 Subject: 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. --- src/lib/dcp_decoder.cc | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/lib/dcp_decoder.cc') 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 -DCPDecoder::fonts () const -{ - vector 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; -} - -- cgit v1.2.3