From 3c802dd6d1451c2c8a7e188f8379738d72e907eb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 14 Oct 2023 21:48:25 +0200 Subject: 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 --- src/lib/dcp_decoder.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/lib/dcp_decoder.h') 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 #include #include @@ -106,4 +107,6 @@ private: boost::optional _forced_reduction; std::string _lazy_digest; + + FontIDAllocator _font_id_allocator; }; -- cgit v1.2.3