X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_decoder.cc;h=c2bd4f3e0bd7dc8fa35167bc726447bca72958d2;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=694b2215725b2a17070256f2f28a3d3b404f905f;hpb=a3997a2b3ca4ff0c3dd5e7f5038cd5633ea75eee;p=dcpomatic.git

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 694b22157..c2bd4f3e0 100644
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -40,7 +40,7 @@ void
 SubRipDecoder::seek (ContentTime time, bool accurate)
 {
 	SubtitleDecoder::seek (time, accurate);
-	
+
 	_next = 0;
 	while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
 		++_next;
@@ -55,7 +55,7 @@ SubRipDecoder::pass ()
 	}
 
 	/* XXX: we are ignoring positioning specified in the file */
-	
+
 	list<dcp::SubtitleString> out;
 	for (list<sub::Line>::const_iterator i = _subtitles[_next].lines.begin(); i != _subtitles[_next].lines.end(); ++i) {
 		for (list<sub::Block>::const_iterator j = i->blocks.begin(); j != i->blocks.end(); ++j) {
@@ -65,10 +65,13 @@ SubRipDecoder::pass ()
 					j->italic,
 					dcp::Colour (255, 255, 255),
 					j->font_size.points (72 * 11),
-					dcp::Time (rint (_subtitles[_next].from.all_as_seconds())),
-					dcp::Time (rint (_subtitles[_next].to.all_as_seconds())),
+					1.0,
+					dcp::Time (_subtitles[_next].from.all_as_seconds()),
+					dcp::Time (_subtitles[_next].to.all_as_seconds()),
+					0,
+					dcp::HALIGN_CENTER,
 					i->vertical_position.line.get() * (1.5 / 22) + 0.8,
-					dcp::TOP,
+					dcp::VALIGN_TOP,
 					j->text,
 					dcp::NONE,
 					dcp::Colour (255, 255, 255),
@@ -85,7 +88,13 @@ SubRipDecoder::pass ()
 }
 
 list<ContentTimePeriod>
-SubRipDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+SubRipDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+	return list<ContentTimePeriod> ();
+}
+
+list<ContentTimePeriod>
+SubRipDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
 {
 	/* XXX: inefficient */