X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_subtitle_decoder.cc;h=b59808728607680c94a2b24549daa23baa3e318b;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hp=5216863a0e8e76a6c7e1e23df7b53ff85b51a40c;hpb=31a33018f113cb7b631dd7bb4d0ed2a7de914cd8;p=dcpomatic.git

diff --git a/src/lib/text_subtitle_decoder.cc b/src/lib/text_subtitle_decoder.cc
index 5216863a0..b59808728 100644
--- a/src/lib/text_subtitle_decoder.cc
+++ b/src/lib/text_subtitle_decoder.cc
@@ -34,65 +34,35 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 
-TextSubtitleDecoder::TextSubtitleDecoder (shared_ptr<const TextSubtitleContent> content)
+TextSubtitleDecoder::TextSubtitleDecoder (shared_ptr<const TextSubtitleContent> content, shared_ptr<Log> log)
 	: TextSubtitle (content)
 	, _next (0)
 {
-	subtitle.reset (
-		new SubtitleDecoder (
-			this,
-			content->subtitle,
-			bind (&TextSubtitleDecoder::image_subtitles_during, this, _1, _2),
-			bind (&TextSubtitleDecoder::text_subtitles_during, this, _1, _2)
-			)
-		);
+	subtitle.reset (new SubtitleDecoder (this, content->subtitle, log));
 }
 
 void
-TextSubtitleDecoder::seek (ContentTime time, bool accurate)
+TextSubtitleDecoder::seek (ContentTime time, bool)
 {
-	subtitle->seek (time, accurate);
-
 	_next = 0;
 	while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
 		++_next;
 	}
 }
 
-bool
-TextSubtitleDecoder::pass (PassReason, bool)
+void
+TextSubtitleDecoder::pass ()
 {
 	if (_next >= _subtitles.size ()) {
-		return true;
+		return;
 	}
 
-	subtitle->give_text (content_time_period (_subtitles[_next]), _subtitles[_next]);
+	ContentTimePeriod const p = content_time_period (_subtitles[_next]);
+	subtitle->emit_text (p, _subtitles[_next]);
+	subtitle->set_position (p.from);
 
 	++_next;
-	return false;
-}
-
-list<ContentTimePeriod>
-TextSubtitleDecoder::image_subtitles_during (ContentTimePeriod, bool) const
-{
-	return list<ContentTimePeriod> ();
-}
-
-list<ContentTimePeriod>
-TextSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
-{
-	/* XXX: inefficient */
-
-	list<ContentTimePeriod> d;
-
-	for (vector<sub::Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-		ContentTimePeriod t = content_time_period (*i);
-		if ((starting && p.contains (t.from)) || (!starting && p.overlaps (t))) {
-			d.push_back (t);
-		}
-	}
-
-	return d;
+	return;
 }
 
 ContentTimePeriod