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

diff --git a/src/lib/text_subtitle_decoder.cc b/src/lib/text_subtitle_decoder.cc
index ecca5188b..b59808728 100644
--- a/src/lib/text_subtitle_decoder.cc
+++ b/src/lib/text_subtitle_decoder.cc
@@ -34,133 +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;
-	}
-
-	list<dcp::SubtitleString> out;
-
-	/* See if our next subtitle needs to be placed on screen by us */
-	bool needs_placement = false;
-	BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
-		if (!i.vertical_position.reference && i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) {
-			needs_placement = true;
-		}
-	}
-
-	BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
-		BOOST_FOREACH (sub::Block j, i.blocks) {
-
-			float v_position;
-			dcp::VAlign v_align;
-			if (needs_placement) {
-				DCPOMATIC_ASSERT (i.vertical_position.line);
-				/* This 0.878 is an arbitrary value to lift the bottom sub off the bottom
-				   of the screen a bit to a pleasing degree.
-				*/
-				v_position = 0.878 + i.vertical_position.line.get() * 1.5 / 22;
-				v_align = dcp::VALIGN_BOTTOM;
-			} else {
-				DCPOMATIC_ASSERT (i.vertical_position.proportional);
-				DCPOMATIC_ASSERT (i.vertical_position.reference);
-				v_position = i.vertical_position.proportional.get();
-				switch (i.vertical_position.reference.get()) {
-				case sub::TOP_OF_SCREEN:
-					v_align = dcp::VALIGN_TOP;
-					break;
-				case sub::CENTRE_OF_SCREEN:
-					v_align = dcp::VALIGN_CENTER;
-					break;
-				case sub::BOTTOM_OF_SCREEN:
-					v_align = dcp::VALIGN_BOTTOM;
-					break;
-				default:
-					v_align = dcp::VALIGN_TOP;
-					break;
-				}
-			}
-
-			out.push_back (
-				dcp::SubtitleString (
-					TextSubtitleContent::font_id,
-					j.italic,
-					j.bold,
-					/* force the colour to whatever is configured */
-					subtitle->content()->colour(),
-					j.font_size.points (72 * 11),
-					1.0,
-					dcp::Time (_subtitles[_next].from.all_as_seconds(), 1000),
-					dcp::Time (_subtitles[_next].to.all_as_seconds(), 1000),
-					0,
-					dcp::HALIGN_CENTER,
-					v_position,
-					v_align,
-					dcp::DIRECTION_LTR,
-					j.text,
-					subtitle->content()->outline() ? dcp::BORDER : dcp::NONE,
-					subtitle->content()->outline_colour(),
-					dcp::Time (0, 1000),
-					dcp::Time (0, 1000)
-					)
-				);
-		}
+		return;
 	}
 
-	subtitle->give_text (content_time_period (_subtitles[_next]), out);
+	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