diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-20 23:41:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-22 02:37:53 +0100 |
| commit | ddcd4f3ba0af3e9d49dbb68127317cd0d871a248 (patch) | |
| tree | 1091683b8dcaf82cd517b844be1d76f290f88f50 /src/lib/player.h | |
| parent | bf4446523dd891049cabf1bcd68d20def57bc731 (diff) | |
Pass fonts from content around as FontData.
i.e. as a block of memory rather than a file. Also, get the
fonts from the decoder rather than the content.
Together, these changes allow us to use fonts from SMPTE DCPs
added as content. Before, fonts would be messed up in those
cases (#1885).
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index ea81ae939..c695e02cd 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -45,7 +45,7 @@ namespace dcp { } namespace dcpomatic { - class Font; + class FontData; } class AtmosContent; @@ -79,7 +79,7 @@ public: bool pass (); void seek (dcpomatic::DCPTime time, bool accurate); - std::list<boost::shared_ptr<dcpomatic::Font> > get_subtitle_fonts (); + std::vector<dcpomatic::FontData> get_subtitle_fonts (); std::list<ReferencedReelAsset> get_reel_assets (); dcp::Size video_container_size () const { boost::mutex::scoped_lock lm (_mutex); |