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_subtitle_decoder.h | |
| 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_subtitle_decoder.h')
| -rw-r--r-- | src/lib/dcp_subtitle_decoder.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h index d1237b276..4f5964c6f 100644 --- a/src/lib/dcp_subtitle_decoder.h +++ b/src/lib/dcp_subtitle_decoder.h @@ -21,7 +21,6 @@ #include "text_decoder.h" #include "dcp_subtitle.h" -#include "font_data.h" class DCPSubtitleContent; @@ -35,8 +34,6 @@ public: bool pass () override; void seek (dcpomatic::ContentTime time, bool accurate) override; - std::vector<dcpomatic::FontData> fonts () const override; - boost::optional<dcpomatic::ContentTime> first () const; private: @@ -44,6 +41,4 @@ private: std::vector<std::shared_ptr<const dcp::Subtitle>> _subtitles; std::vector<std::shared_ptr<const dcp::Subtitle>>::const_iterator _next; - - std::vector<dcpomatic::FontData> _fonts; }; |