Use the correct font to render subtitles in preview / burn-in (#663).

[dcpomatic.git] / src / lib / dcp_subtitle_decoder.cc

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index bb2537fc4181368e4ca53390513f18941a9f58e0..fd801da2f53dc6f2a0bcb86953d15e6b16ef1d8a 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -52,10 +52,22 @@ DCPSubtitleDecoder::pass ()
                return true;
        }
 
+       /* Gather all subtitles with the same time period that are next
+          on the list.  We must emit all subtitles for the same time
+          period with the same text_subtitle() call otherwise the
+          SubtitleDecoder will assume there is nothing else at the
+          time of emit the first.
+       */
+
        list<dcp::SubtitleString> s;
-       s.push_back (*_next);
-       text_subtitle (content_time_period (*_next), s);
-       ++_next;
+       ContentTimePeriod const p = content_time_period (*_next);
+
+       while (_next != _subtitles.end () && content_time_period (*_next) == p) {
+               s.push_back (*_next);
+               ++_next;
+       }
+
+       text_subtitle (p, s);
 
        return false;
 }