Missing setup of SubtitleDecoder position causing #1271 and probably other things.
authorCarl Hetherington <cth@carlh.net>
Tue, 10 Apr 2018 22:40:09 +0000 (23:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 10 Apr 2018 22:40:22 +0000 (23:40 +0100)
ChangeLog
src/lib/subtitle_decoder.cc

index d30e12b..4a6285b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-10  Carl Hetherington  <cth@carlh.net>
+
+       * Fix disappearing subtitles when they are added from text files
+       alongside video content which also contain subtitles (#1271).
+
 2018-04-06  Carl Hetherington  <cth@carlh.net>
 
        * Fix missing start icon for the player in Linux.
index 39c3641..32cae6a 100644 (file)
@@ -61,6 +61,7 @@ void
 SubtitleDecoder::emit_image_start (ContentTime from, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
 {
        ImageStart (ContentImageSubtitle (from, image, rect));
+       _position = from;
 }
 
 void