diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-10-14 21:48:25 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-10-15 09:10:18 +0200 |
| commit | 3c802dd6d1451c2c8a7e188f8379738d72e907eb (patch) | |
| tree | 454396cf5451535b8708a0c4961c7d5c2b30ea1f /src/lib/dcp_decoder.h | |
| parent | 1bfe44b1503fb0f5cffda135076709014337de52 (diff) | |
Fix DCP content font ID allocation to cope with DCPs that have multiple fonts
with the same name in the same reel (#2600).
Previously we had this id_for_font_in_reel() which would give an ID
of N_font-ID. This means we got duplicate font IDs.
Here we replace that method with FontAllocator, which gives an ID of
N_font-ID for the first font and M_font-ID, where M is a number higher than
the highest reel index. The idea is to support the required new IDs
without breaking exisiting projects.
There is some documentation of how it works in doc/design/fonts
Diffstat (limited to 'src/lib/dcp_decoder.h')
| -rw-r--r-- | src/lib/dcp_decoder.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 803c93a86..2c0cd8f41 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -26,6 +26,7 @@ #include "atmos_metadata.h" #include "decoder.h" +#include "font_id_allocator.h" #include <dcp/mono_picture_asset_reader.h> #include <dcp/stereo_picture_asset_reader.h> #include <dcp/sound_asset_reader.h> @@ -106,4 +107,6 @@ private: boost::optional<int> _forced_reduction; std::string _lazy_digest; + + FontIDAllocator _font_id_allocator; }; |