X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=1c6b973d683913722e4b6cecb2570bed205b0f21;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=20a9f32fee031ddd99fc03f19ab1d5182614e6f7;hpb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 20a9f32fe..1c6b973d6 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -17,9 +17,10 @@
 
 */
 
-#include <dcp/subtitle_content.h>
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
+#include <dcp/interop_subtitle_asset.h>
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -28,8 +29,8 @@ using boost::shared_ptr;
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
 	: SubtitleDecoder (content)
 {
-	dcp::SubtitleContent c (content->path (0), false);
-	_subtitles = c.subtitles ();
+	shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+	_subtitles = c->subtitles ();
 	_next = _subtitles.begin ();
 }
 
@@ -40,7 +41,7 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 
 	_next = _subtitles.begin ();
 	list<dcp::SubtitleString>::const_iterator i = _subtitles.begin ();
-	while (i != _subtitles.end() && ContentTime::from_seconds (_next->in().to_seconds()) < time) {
+	while (i != _subtitles.end() && ContentTime::from_seconds (_next->in().as_seconds()) < time) {
 		++i;
 	}
 }
@@ -52,27 +53,41 @@ 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 (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;
 }
 
 list<ContentTimePeriod>
-DCPSubtitleDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+DCPSubtitleDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+	return list<ContentTimePeriod> ();
+}
+
+list<ContentTimePeriod>
+DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
 {
 	/* XXX: inefficient */
 
 	list<ContentTimePeriod> d;
 
 	for (list<dcp::SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-		ContentTimePeriod period (
-			ContentTime::from_seconds (i->in().to_seconds ()),
-			ContentTime::from_seconds (i->out().to_seconds ())
-			);
-		
+		ContentTimePeriod period = content_time_period (*i);
 		if ((starting && p.contains (period.from)) || (!starting && p.overlaps (period))) {
 			d.push_back (period);
 		}
@@ -81,3 +96,11 @@ DCPSubtitleDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
 	return d;
 }
 
+ContentTimePeriod
+DCPSubtitleDecoder::content_time_period (dcp::SubtitleString s) const
+{
+	return ContentTimePeriod (
+		ContentTime::from_seconds (s.in().as_seconds ()),
+		ContentTime::from_seconds (s.out().as_seconds ())
+		);
+}