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/string_text_file_decoder.cc | 14 -------------- 1 file changed, 14 deletions(-) (limited to '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 d366bedc0..d5f320a27 100644 --- a/src/lib/string_text_file_decoder.cc +++ b/src/lib/string_text_file_decoder.cc @@ -91,17 +91,3 @@ StringTextFileDecoder::content_time_period (sub::Subtitle s) const ContentTime::from_seconds (s.to.all_as_seconds()) ); } - - -vector -StringTextFileDecoder::fonts () const -{ - vector data; - for (auto i: text) { - for (auto j: i->content()->fonts()) { - data.push_back (FontData(j)); - } - } - return data; -} - -- cgit v1.2.3