From e06941199da90359f41ce80c276752bc0f172d7e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 28 Apr 2022 14:00:07 +0200 Subject: Handle multiple bitmap subtitles at the same time correctly (#2239). Previously if there were two images at the same time we would start them both, then the stop time would be set in the second one but not the first. This meant that the first one would hang around forever. --- src/lib/content_text.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/lib/content_text.h') diff --git a/src/lib/content_text.h b/src/lib/content_text.h index fb86bc786..438a76a6e 100644 --- a/src/lib/content_text.h +++ b/src/lib/content_text.h @@ -45,9 +45,14 @@ private: dcpomatic::ContentTime _from; }; + class ContentBitmapText : public ContentText { public: + ContentBitmapText (dcpomatic::ContentTime from) + : ContentText(from) + {} + ContentBitmapText (dcpomatic::ContentTime f, std::shared_ptr im, dcpomatic::Rect r) : ContentText (f) , subs{ {im, r} } @@ -57,6 +62,7 @@ public: std::vector subs; }; + /** A text caption. We store the time period separately (as well as in the dcp::SubtitleStrings) * as the dcp::SubtitleString timings are sometimes quite heavily quantised and this causes problems * when we want to compare the quantised periods to the unquantised ones. -- cgit v1.2.3