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/decoder.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/decoder.h')
| -rw-r--r-- | src/lib/decoder.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 97de208b2..169d55553 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -27,6 +27,7 @@ #include "types.h" #include "film.h" +#include "font_data.h" #include "dcpomatic_time.h" #include "weak_film.h" #include <boost/utility.hpp> @@ -61,6 +62,10 @@ public: virtual void seek (dcpomatic::ContentTime time, bool accurate); virtual dcpomatic::ContentTime position () const; + + virtual std::vector<dcpomatic::FontData> fonts () const { + return std::vector<dcpomatic::FontData>(); + } }; #endif |