X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_decoder.cc;h=2de27248111eb17eaddd8f93f2afcf095522224d;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=e2bdc347b93b202183d483f6a606dfc665324a13;hpb=94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1;p=dcpomatic.git

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index e2bdc347b..2de272481 100644
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -20,10 +20,14 @@
 #include <dcp/subtitle_string.h>
 #include "subrip_decoder.h"
 #include "subrip_content.h"
+#include <iostream>
 
 using std::list;
 using std::vector;
+using std::string;
+using std::cout;
 using boost::shared_ptr;
+using boost::optional;
 
 SubRipDecoder::SubRipDecoder (shared_ptr<const SubRipContent> content)
 	: SubtitleDecoder (content)
@@ -37,13 +41,11 @@ void
 SubRipDecoder::seek (ContentTime time, bool accurate)
 {
 	SubtitleDecoder::seek (time, accurate);
-	
+
 	_next = 0;
-	list<SubRipSubtitlePiece>::const_iterator i = _subtitles[_next].pieces.begin();
-	while (i != _subtitles[_next].pieces.end() && _subtitles[_next].period.from < time) {
-		++i;
+	while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
+		++_next;
 	}
-	
 }
 
 bool
@@ -52,45 +54,69 @@ SubRipDecoder::pass ()
 	if (_next >= _subtitles.size ()) {
 		return true;
 	}
-	
+
+	/* XXX: we are ignoring positioning specified in the file */
+
 	list<dcp::SubtitleString> out;
-	for (list<SubRipSubtitlePiece>::const_iterator i = _subtitles[_next].pieces.begin(); i != _subtitles[_next].pieces.end(); ++i) {
-		out.push_back (
-			dcp::SubtitleString (
-				"Arial",
-				i->italic,
-				dcp::Color (255, 255, 255),
-				72,
-				dcp::Time (rint (_subtitles[_next].period.from.seconds() * 250)),
-				dcp::Time (rint (_subtitles[_next].period.to.seconds() * 250)),
-				0.9,
-				dcp::BOTTOM,
-				i->text,
-				dcp::NONE,
-				dcp::Color (255, 255, 255),
-				0,
-				0
-				)
-			);
+	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) {
+			out.push_back (
+				dcp::SubtitleString (
+					SubRipContent::font_id,
+					j->italic,
+					dcp::Colour (j->colour.r * 255, j->colour.g * 255, j->colour.b * 255),
+					j->font_size.points (72 * 11),
+					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::VALIGN_TOP,
+					j->text,
+					dcp::NONE,
+					dcp::Colour (255, 255, 255),
+					0,
+					0
+					)
+				);
+		}
 	}
 
-	text_subtitle (out);
+	text_subtitle (content_time_period (_subtitles[_next]), out);
+
 	++_next;
 	return false;
 }
 
 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 */
 
 	list<ContentTimePeriod> d;
 
-	for (vector<SubRipSubtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-		if ((starting && p.contains (i->period.from)) || (!starting && p.overlaps (i->period))) {
-			d.push_back (i->period);
+	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;
 }
+
+ContentTimePeriod
+SubRipDecoder::content_time_period (sub::Subtitle s) const
+{
+	return ContentTimePeriod (
+		ContentTime::from_seconds (s.from.all_as_seconds()),
+		ContentTime::from_seconds (s.to.all_as_seconds())
+		);
+}