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/content_text.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/content_text.h')
| -rw-r--r-- | src/lib/content_text.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/content_text.h b/src/lib/content_text.h index cd9d34bf9..06fb39cfc 100644 --- a/src/lib/content_text.h +++ b/src/lib/content_text.h @@ -26,6 +26,7 @@ #include "bitmap_text.h" #include "dcpomatic_time.h" #include "rect.h" +#include "string_text.h" #include "types.h" #include <dcp/subtitle_string.h> #include <vector> @@ -74,12 +75,12 @@ public: class ContentStringText : public ContentText { public: - ContentStringText (dcpomatic::ContentTime f, std::vector<dcp::SubtitleString> s) + ContentStringText (dcpomatic::ContentTime f, std::vector<StringText> s) : ContentText (f) , subs (s) {} - std::vector<dcp::SubtitleString> subs; + std::vector<StringText> subs; }; |