projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix handling of empty font IDs and default DCP fonts (#2721) (part of #2722).
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle_decoder.h
diff --git
a/src/lib/dcp_subtitle_decoder.h
b/src/lib/dcp_subtitle_decoder.h
index 45a4999ddcf769781bd87c8a577264b6511a6e06..9d085125382e82f55d237e52414585f3e3930cf4 100644
(file)
--- a/
src/lib/dcp_subtitle_decoder.h
+++ b/
src/lib/dcp_subtitle_decoder.h
@@
-19,8
+19,9
@@
*/
*/
-#include "text_decoder.h"
#include "dcp_subtitle.h"
#include "dcp_subtitle.h"
+#include "font_id_allocator.h"
+#include "text_decoder.h"
class DCPSubtitleContent;
class DCPSubtitleContent;
@@
-44,4
+45,7
@@
private:
std::vector<std::shared_ptr<const dcp::Subtitle>>::const_iterator _next;
dcp::SubtitleStandard _subtitle_standard;
std::vector<std::shared_ptr<const dcp::Subtitle>>::const_iterator _next;
dcp::SubtitleStandard _subtitle_standard;
+
+ std::shared_ptr<dcp::SubtitleAsset> _asset;
+ FontIDAllocator _font_id_allocator;
};
};