X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.cc;h=f182c53e559e4e01c7cba8d3749145bbaa0ba3c2;hb=0758d834992f0adb8aa8d4d9908a64ce8708f05c;hp=a7da626b7665fb6d1af02908d7aaccb1c358f7eb;hpb=526fd6de4c80a7ac9614a1cb0209efff7b171cd5;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index a7da626b7..f182c53e5 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 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
@@ -27,9 +27,18 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::optional;
-
-SubtitleDecoder::SubtitleDecoder (shared_ptr<const SubtitleContent> c)
-	: _subtitle_content (c)
+using boost::function;
+
+SubtitleDecoder::SubtitleDecoder (
+	Decoder* parent,
+	shared_ptr<const SubtitleContent> c,
+	function<list<ContentTimePeriod> (ContentTimePeriod, bool)> image_during,
+	function<list<ContentTimePeriod> (ContentTimePeriod, bool)> text_during
+	)
+	: _parent (parent)
+	, _content (c)
+	, _image_during (image_during)
+	, _text_during (text_during)
 {
 
 }
@@ -42,21 +51,21 @@ SubtitleDecoder::SubtitleDecoder (shared_ptr<const SubtitleContent> c)
  *  of the video frame)
  */
 void
-SubtitleDecoder::image_subtitle (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
+SubtitleDecoder::give_image (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
 {
-	_decoded_image_subtitles.push_back (ContentImageSubtitle (period, image, rect));
+	_decoded_image.push_back (ContentImageSubtitle (period, image, rect));
 }
 
 void
-SubtitleDecoder::text_subtitle (ContentTimePeriod period, list<dcp::SubtitleString> s)
+SubtitleDecoder::give_text (ContentTimePeriod period, list<dcp::SubtitleString> s)
 {
-	_decoded_text_subtitles.push_back (ContentTextSubtitle (period, s));
+	_decoded_text.push_back (ContentTextSubtitle (period, s));
 }
 
 /** @param sp Full periods of subtitles that are showing or starting during the specified period */
 template <class T>
 list<T>
-SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting)
+SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting, bool accurate)
 {
 	if (sp.empty ()) {
 		/* Nothing in this period */
@@ -72,7 +81,7 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
 	 *  (a) give us what we want, or
 	 *  (b) hit the end of the decoder.
 	 */
-	while (!pass () && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
+	while (!_parent->pass(Decoder::PASS_REASON_SUBTITLE, accurate) && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
 
 	/* Now look for what we wanted in the data we have collected */
 	/* XXX: inefficient */
@@ -86,8 +95,8 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
 
 	/* Discard anything in _decoded_image_subtitles that is outside 5 seconds either side of period */
 
-	list<ContentImageSubtitle>::iterator i = _decoded_image_subtitles.begin();
-	while (i != _decoded_image_subtitles.end()) {
+	list<ContentImageSubtitle>::iterator i = _decoded_image.begin();
+	while (i != _decoded_image.end()) {
 		list<ContentImageSubtitle>::iterator tmp = i;
 		++tmp;
 
@@ -95,7 +104,7 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
 			i->period().to < (period.from - ContentTime::from_seconds (5)) ||
 			i->period().from > (period.to + ContentTime::from_seconds (5))
 			) {
-			_decoded_image_subtitles.erase (i);
+			_decoded_image.erase (i);
 		}
 
 		i = tmp;
@@ -105,20 +114,20 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
 }
 
 list<ContentTextSubtitle>
-SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting)
+SubtitleDecoder::get_text (ContentTimePeriod period, bool starting, bool accurate)
 {
-	return get<ContentTextSubtitle> (_decoded_text_subtitles, text_subtitles_during (period, starting), period, starting);
+	return get<ContentTextSubtitle> (_decoded_text, _text_during (period, starting), period, starting, accurate);
 }
 
 list<ContentImageSubtitle>
-SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting)
+SubtitleDecoder::get_image (ContentTimePeriod period, bool starting, bool accurate)
 {
-	return get<ContentImageSubtitle> (_decoded_image_subtitles, image_subtitles_during (period, starting), period, starting);
+	return get<ContentImageSubtitle> (_decoded_image, _image_during (period, starting), period, starting, accurate);
 }
 
 void
 SubtitleDecoder::seek (ContentTime, bool)
 {
-	_decoded_text_subtitles.clear ();
-	_decoded_image_subtitles.clear ();
+	_decoded_text.clear ();
+	_decoded_image.clear ();
 }