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/reel_writer.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/reel_writer.h')
| -rw-r--r-- | src/lib/reel_writer.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index 388494247..3d214878b 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -31,7 +31,7 @@ #include <boost/weak_ptr.hpp> namespace dcpomatic { - class Font; + class FontData; } class Film; @@ -78,7 +78,7 @@ public: void finish (boost::filesystem::path output_dcp); boost::shared_ptr<dcp::Reel> create_reel ( std::list<ReferencedReelAsset> const & refs, - std::list<boost::shared_ptr<dcpomatic::Font> > const & fonts, + std::vector<dcpomatic::FontData> const & fonts, boost::filesystem::path output_dcp, bool ensure_subtitles, std::set<DCPTextTrack> ensure_closed_captions @@ -111,7 +111,8 @@ private: void create_reel_sound (boost::shared_ptr<dcp::Reel> reel, std::list<ReferencedReelAsset> const & refs) const; void create_reel_text ( boost::shared_ptr<dcp::Reel> reel, - std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<dcpomatic::Font> > const& fonts, + std::list<ReferencedReelAsset> const & refs, + std::vector<dcpomatic::FontData> const& fonts, int64_t duration, boost::filesystem::path output_dcp, bool ensure_subtitles, @@ -132,6 +133,8 @@ private: boost::weak_ptr<Job> _job; bool _text_only; + dcp::ArrayData _default_font; + boost::shared_ptr<dcp::PictureAsset> _picture_asset; /** picture asset writer, or 0 if we are not writing any picture because we already have one */ boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer; |