From c8a036eb727ceddc64a0304d781c916eb952c001 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Jun 2022 09:58:16 +0200 Subject: Set up TextDecoder position based on the time that the next thing will be emitted, instead of the time that the last thing was (#2268). This is to avoid problems with the example shown in the test, where just because a subtitle in source A comes before a subtitle in source B, source A is pass()ed next and may then emit a subtitle which should be after the next one in B. --- src/lib/dcp_subtitle_decoder.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/lib/dcp_subtitle_decoder.h') diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h index 4f5964c6f..16f89b530 100644 --- a/src/lib/dcp_subtitle_decoder.h +++ b/src/lib/dcp_subtitle_decoder.h @@ -38,6 +38,7 @@ public: private: dcpomatic::ContentTimePeriod content_time_period (std::shared_ptr s) const; + void update_position(); std::vector> _subtitles; std::vector>::const_iterator _next; -- cgit v1.2.3