X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.cc;h=e1485e221d70807109e3803b0493c9d8524fe974;hb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;hp=13cf481c8027f70e0b468235ef0736cf47278570;hpb=04533b9cf34ce8089113015715083ee9c5b2b001;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 13cf481c8..e1485e221 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -38,40 +38,43 @@ SubtitleDecoder::SubtitleDecoder (shared_ptr<const SubtitleContent> c)
 void
 SubtitleDecoder::image_subtitle (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
 {
-	_decoded_image_subtitles.push_back (shared_ptr<ContentImageSubtitle> (new ContentImageSubtitle (period, image, rect)));
+	_decoded_image_subtitles.push_back (ContentImageSubtitle (period, image, rect));
 }
 
 void
 SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s)
 {
-	_decoded_text_subtitles.push_back (shared_ptr<ContentTextSubtitle> (new ContentTextSubtitle (s)));
+	_decoded_text_subtitles.push_back (ContentTextSubtitle (s));
 }
 
 template <class T>
-list<shared_ptr<T> >
-SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTimePeriod period)
+list<T>
+SubtitleDecoder::get (list<T> const & subs, ContentTimePeriod period, bool starting)
 {
-	if (!_subtitle_content->has_subtitle_during (period)) {
-		return list<shared_ptr<T> > ();
+	/* Get the full periods of the subtitles that are showing or starting during the specified period */
+	list<ContentTimePeriod> sp = subtitles_during (period, starting);
+	if (sp.empty ()) {
+		/* Nothing in this period */
+		return list<T> ();
 	}
 
-	if (subs.empty() || period.from < subs.front()->period().from || period.to > (subs.back()->period().to + ContentTime::from_seconds (10))) {
-		/* Either we have no decoded data, or what we do have is a long way from what we want: seek */
-		seek (period.from, true);
+	/* Seek if what we want is before what we have, or more than a reasonable amount after */
+	if (subs.empty() || sp.back().to < subs.front().period().from || sp.front().from > (subs.back().period().to + ContentTime::from_seconds (5))) {
+		seek (sp.front().from, true);
 	}
 
 	/* Now enough pass() calls will either:
 	 *  (a) give us what we want, or
 	 *  (b) hit the end of the decoder.
 	 */
-	while (!pass() && (subs.empty() || (subs.front()->period().from > period.from || period.to < subs.back()->period().to))) {}
+	while (!pass() && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
 
 	/* Now look for what we wanted in the data we have collected */
 	/* XXX: inefficient */
 	
-	list<shared_ptr<T> > out;
-	for (typename list<shared_ptr<T> >::const_iterator i = subs.begin(); i != subs.end(); ++i) {
-		if ((*i)->period().from <= period.to && (*i)->period().to >= period.from) {
+	list<T> out;
+	for (typename list<T>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
+		if ((starting && period.contains (i->period().from)) || (!starting && period.overlaps (i->period ()))) {
 			out.push_back (*i);
 		}
 	}
@@ -79,16 +82,16 @@ SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTimePeriod perio
 	return out;
 }
 
-list<shared_ptr<ContentTextSubtitle> >
-SubtitleDecoder::get_text_subtitles (ContentTimePeriod period)
+list<ContentTextSubtitle>
+SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting)
 {
-	return get<ContentTextSubtitle> (_decoded_text_subtitles, period);
+	return get<ContentTextSubtitle> (_decoded_text_subtitles, period, starting);
 }
 
-list<shared_ptr<ContentImageSubtitle> >
-SubtitleDecoder::get_image_subtitles (ContentTimePeriod period)
+list<ContentImageSubtitle>
+SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting)
 {
-	return get<ContentImageSubtitle> (_decoded_image_subtitles, period);
+	return get<ContentImageSubtitle> (_decoded_image_subtitles, period, starting);
 }
 
 void