X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_subtitle_decoder.cc;h=ad9c00b63da4962a0d3a3447c567f363721fc862;hb=97c1bc360f912d66d3fc0430b331214e4da79644;hp=893fd5d3c3099cd1277a9c64a2b609aa93d44056;hpb=80400212e939dc2f3b987cb6df57709929aa5178;p=dcpomatic.git

diff --git a/src/lib/text_subtitle_decoder.cc b/src/lib/text_subtitle_decoder.cc
index 893fd5d3c..ad9c00b63 100644
--- a/src/lib/text_subtitle_decoder.cc
+++ b/src/lib/text_subtitle_decoder.cc
@@ -1,24 +1,26 @@
 /*
     Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "text_subtitle_decoder.h"
 #include "text_subtitle_content.h"
+#include "subtitle_content.h"
 #include <dcp/subtitle_string.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -33,17 +35,23 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 
 TextSubtitleDecoder::TextSubtitleDecoder (shared_ptr<const TextSubtitleContent> content)
-	: SubtitleDecoder (content)
-	, TextSubtitle (content)
+	: 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)
+			)
+		);
 }
 
 void
 TextSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
-	SubtitleDecoder::seek (time, accurate);
+	subtitle->seek (time, accurate);
 
 	_next = 0;
 	while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
@@ -58,51 +66,7 @@ TextSubtitleDecoder::pass (PassReason, bool)
 		return true;
 	}
 
-	/* XXX: we are ignoring positioning specified in the file */
-
-	shared_ptr<const TextSubtitleContent> content = dynamic_pointer_cast<const TextSubtitleContent> (_subtitle_content);
-	DCPOMATIC_ASSERT (content);
-
-	list<dcp::SubtitleString> out;
-
-	/* Highest line index in this subtitle */
-	int highest = 0;
-	BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
-		DCPOMATIC_ASSERT (i.vertical_position.reference && i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE);
-		DCPOMATIC_ASSERT (i.vertical_position.line);
-		highest = max (highest, i.vertical_position.line.get());
-	}
-
-	BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
-		BOOST_FOREACH (sub::Block j, i.blocks) {
-			out.push_back (
-				dcp::SubtitleString (
-					TextSubtitleContent::font_id,
-					j.italic,
-					/* force the colour to whatever is configured */
-					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,
-					/* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
-					   of the screen a bit to a pleasing degree.
-					*/
-					1.015 - ((1 + highest - i.vertical_position.line.get()) * 1.5 / 22),
-					dcp::VALIGN_TOP,
-					j.text,
-					content->outline() ? dcp::BORDER : dcp::NONE,
-					content->outline_colour(),
-					dcp::Time (0, 1000),
-					dcp::Time (0, 1000)
-					)
-				);
-		}
-	}
-
-	text_subtitle (content_time_period (_subtitles[_next]), out);
+	subtitle->give_text (content_time_period (_subtitles[_next]), _subtitles[_next]);
 
 	++_next;
 	return false;
@@ -139,3 +103,9 @@ TextSubtitleDecoder::content_time_period (sub::Subtitle s) const
 		ContentTime::from_seconds (s.to.all_as_seconds())
 		);
 }
+
+void
+TextSubtitleDecoder::reset ()
+{
+	subtitle->reset ();
+}