X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.cc;h=786199e31a681d47db0f3b27cd9efad00de13208;hb=74fe68e5895654e27a7cf8097917c1e95fa89519;hp=3daa6e431820ef5b249c1a86ceacc27cf5d85f84;hpb=034feb503b0a38eb82c21ae8d9f83522fc63a25c;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 3daa6e431..786199e31 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,12 +19,15 @@
 
 #include <boost/shared_ptr.hpp>
 #include "subtitle_decoder.h"
+#include "subtitle_content.h"
 
 using std::list;
+using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
-SubtitleDecoder::SubtitleDecoder ()
+SubtitleDecoder::SubtitleDecoder (shared_ptr<const SubtitleContent> c)
+	: _subtitle_content (c)
 {
 
 }
@@ -33,9 +36,9 @@ SubtitleDecoder::SubtitleDecoder ()
  *  Image may be 0 to say that there is no current subtitle.
  */
 void
-SubtitleDecoder::image_subtitle (ContentTime from, ContentTime to, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
+SubtitleDecoder::image_subtitle (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
 {
-	_decoded_image_subtitles.push_back (shared_ptr<ContentImageSubtitle> (new ContentImageSubtitle (from, to, image, rect)));
+	_decoded_image_subtitles.push_back (shared_ptr<ContentImageSubtitle> (new ContentImageSubtitle (period, image, rect)));
 }
 
 void
@@ -46,12 +49,29 @@ SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s)
 
 template <class T>
 list<shared_ptr<T> >
-get (list<shared_ptr<T> > const & subs, ContentTime from, ContentTime to)
+SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTimePeriod period)
 {
+	if (!has_subtitle_during (period)) {
+		return list<shared_ptr<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);
+	}
+
+	/* 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))) {}
+
+	/* 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)->from() <= to && (*i)->to() >= from) {
+		if ((*i)->period().overlaps (period)) {
 			out.push_back (*i);
 		}
 	}
@@ -60,13 +80,20 @@ get (list<shared_ptr<T> > const & subs, ContentTime from, ContentTime to)
 }
 
 list<shared_ptr<ContentTextSubtitle> >
-SubtitleDecoder::get_text_subtitles (ContentTime from, ContentTime to)
+SubtitleDecoder::get_text_subtitles (ContentTimePeriod period)
 {
-	return get<ContentTextSubtitle> (_decoded_text_subtitles, from, to);
+	return get<ContentTextSubtitle> (_decoded_text_subtitles, period);
 }
 
 list<shared_ptr<ContentImageSubtitle> >
-SubtitleDecoder::get_image_subtitles (ContentTime from, ContentTime to)
+SubtitleDecoder::get_image_subtitles (ContentTimePeriod period)
+{
+	return get<ContentImageSubtitle> (_decoded_image_subtitles, period);
+}
+
+void
+SubtitleDecoder::seek (ContentTime, bool)
 {
-	return get<ContentImageSubtitle> (_decoded_image_subtitles, from, to);
+	_decoded_text_subtitles.clear ();
+	_decoded_image_subtitles.clear ();
 }