From c8ff422a42eac30517a7acde57ab84e55449f4e4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 26 Jun 2015 22:02:00 +0100 Subject: Fix missing subtitles in some cases. We were passing subtitles back from decoders to SubtitleDecoder using dcp::SubtitleStrings and relying on their storage of time to know when the subtitles were. These times are quantised (by the use of dcp::SubtitleString) and then compared with unquantised times (kept as ContentTime) in the main checking loop in SubtitleDecoder::get(). Fix this by storing periods as ContentTimePeriod as well as in the dcp::SubtitleStrings. --- src/lib/subtitle_decoder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/subtitle_decoder.h') diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h index c958419c7..5f11e27e7 100644 --- a/src/lib/subtitle_decoder.h +++ b/src/lib/subtitle_decoder.h @@ -42,7 +42,7 @@ protected: void seek (ContentTime, bool); void image_subtitle (ContentTimePeriod period, boost::shared_ptr, dcpomatic::Rect); - void text_subtitle (std::list); + void text_subtitle (ContentTimePeriod period, std::list); std::list _decoded_image_subtitles; std::list _decoded_text_subtitles; -- cgit v1.2.3