X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fsubtitle_decoder.cc;h=0f5a1992c46bad7d9e43d58bf4048a601a0bc0a3;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hp=cf5550e42eaa31177b54b8256f77e7ec5fee5bc5;hpb=1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index cf5550e42..0f5a1992c 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
@@ -21,27 +21,75 @@
 #include "subtitle_decoder.h"
 
 using std::list;
+using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
-SubtitleDecoder::SubtitleDecoder (shared_ptr<const Film> f)
-	: Decoder (f)
+SubtitleDecoder::SubtitleDecoder ()
 {
 
 }
 
-
 /** Called by subclasses when an image subtitle is ready.
  *  Image may be 0 to say that there is no current subtitle.
  */
 void
-SubtitleDecoder::image_subtitle (shared_ptr<Image> image, dcpomatic::Rect<double> rect, ContentTime from, ContentTime to)
+SubtitleDecoder::image_subtitle (ContentTime from, ContentTime to, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
 {
-	_pending.push_back (shared_ptr<DecodedImageSubtitle> (new DecodedImageSubtitle (from, to, image, rect)));
+	_decoded_image_subtitles.push_back (shared_ptr<ContentImageSubtitle> (new ContentImageSubtitle (from, to, image, rect)));
 }
 
 void
 SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s)
 {
-	_pending.push_back (shared_ptr<DecodedTextSubtitle> (new DecodedTextSubtitle (s)));
+	_decoded_text_subtitles.push_back (shared_ptr<ContentTextSubtitle> (new ContentTextSubtitle (s)));
+}
+
+template <class T>
+list<shared_ptr<T> >
+SubtitleDecoder::get (list<shared_ptr<T> > const & subs, ContentTime from, ContentTime to)
+{
+	if (subs.empty() || from < subs.front()->from() || to > (subs.back()->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 (from, true);
+	}
+
+	/* Now enough pass() calls will either:
+	 *  (a) give us what we want, or
+	 *  (b) hit the end of the decoder.
+	 *
+	 *  XXX: with subs being sparse, this may need more care...
+	 */
+	while (!pass() && (subs.empty() || (subs.front()->from() > from || to < subs.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)->from() <= to && (*i)->to() >= from) {
+			out.push_back (*i);
+		}
+	}
+
+	return out;
+}
+
+list<shared_ptr<ContentTextSubtitle> >
+SubtitleDecoder::get_text_subtitles (ContentTime from, ContentTime to)
+{
+	return get<ContentTextSubtitle> (_decoded_text_subtitles, from, to);
+}
+
+list<shared_ptr<ContentImageSubtitle> >
+SubtitleDecoder::get_image_subtitles (ContentTime from, ContentTime to)
+{
+	return get<ContentImageSubtitle> (_decoded_image_subtitles, from, to);
+}
+
+void
+SubtitleDecoder::seek (ContentTime, bool)
+{
+	_decoded_text_subtitles.clear ();
+	_decoded_image_subtitles.clear ();
 }