Basics of subtitle split.

[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..964ee6f202cea7e8ef0b5d503dab34ac07b446fb 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -20,13 +20,14 @@
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
 #include <dcp/interop_subtitle_asset.h>
+#include <iostream>
 
 using std::list;
 using std::cout;
 using boost::shared_ptr;
 
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
-       : SubtitleDecoder (content)
+       : SubtitleDecoder (content->subtitle)
 {
        shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
        _subtitles = c->subtitles ();
@@ -46,16 +47,28 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-DCPSubtitleDecoder::pass ()
+DCPSubtitleDecoder::pass (PassReason, bool)
 {
        if (_next == _subtitles.end ()) {
                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;
 }