From 751379da4be48f9b911a91cf17686330dd999d0c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 5 Dec 2023 01:59:44 +0100 Subject: Account for split branch in libdcp. --- src/lib/text_decoder.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/text_decoder.h') diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h index 1a7632fd8..91f452b60 100644 --- a/src/lib/text_decoder.h +++ b/src/lib/text_decoder.h @@ -29,8 +29,8 @@ #include "rect.h" #include "content_text.h" #include "types.h" -#include -#include +#include +#include #include @@ -52,9 +52,9 @@ public: void emit_bitmap_start (ContentBitmapText const& bitmap); void emit_bitmap (dcpomatic::ContentTimePeriod period, std::shared_ptr image, dcpomatic::Rect rect); - void emit_plain_start(dcpomatic::ContentTime from, std::vector s, dcp::SubtitleStandard valign_standard); + void emit_plain_start(dcpomatic::ContentTime from, std::vector s, dcp::TextStandard valign_standard); void emit_plain_start (dcpomatic::ContentTime from, sub::Subtitle const & subtitle); - void emit_plain(dcpomatic::ContentTimePeriod period, std::vector s, dcp::SubtitleStandard valign_standard); + void emit_plain(dcpomatic::ContentTimePeriod period, std::vector s, dcp::TextStandard valign_standard); void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle); void emit_stop (dcpomatic::ContentTime to); -- cgit v1.2.3