X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fstring_text_file_decoder.cc;h=2ec0ec1cb74f10cc3f32769c378670f97204efd3;hb=fe933ebb2c55b4235fcba5d02af2ba91c272fc88;hp=8c9880b0c7118881942b3cebb2ab76991e25bf06;hpb=84012cdd64f451891febd36154b7226ea21a899b;p=dcpomatic.git

diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc
index 8c9880b0c..2ec0ec1cb 100644
--- a/src/lib/string_text_file_decoder.cc
+++ b/src/lib/string_text_file_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,35 +18,33 @@
 
 */
 
+
 #include "string_text_file_decoder.h"
 #include "string_text_file_content.h"
 #include "text_content.h"
 #include "text_decoder.h"
 #include <dcp/subtitle_string.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
-using std::list;
-using std::vector;
-using std::string;
+
 using std::cout;
-using std::max;
-using boost::shared_ptr;
-using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+using namespace dcpomatic;
+
 
 StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, shared_ptr<const StringTextFileContent> content)
 	: Decoder (film)
 	, StringTextFile (content)
 	, _next (0)
 {
-	ContentTime first;
-	if (!_subtitles.empty()) {
-		first = content_time_period(_subtitles[0]).from;
-	}
-	text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
+	text.push_back (make_shared<TextDecoder>(this, content->only_text()));
+	update_position();
 }
 
+
 void
 StringTextFileDecoder::seek (ContentTime time, bool accurate)
 {
@@ -64,8 +62,11 @@ StringTextFileDecoder::seek (ContentTime time, bool accurate)
 	while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
 		++_next;
 	}
+
+	update_position();
 }
 
+
 bool
 StringTextFileDecoder::pass ()
 {
@@ -77,9 +78,13 @@ StringTextFileDecoder::pass ()
 	only_text()->emit_plain (p, _subtitles[_next]);
 
 	++_next;
+
+	update_position();
+
 	return false;
 }
 
+
 ContentTimePeriod
 StringTextFileDecoder::content_time_period (sub::Subtitle s) const
 {
@@ -88,3 +93,15 @@ StringTextFileDecoder::content_time_period (sub::Subtitle s) const
 		ContentTime::from_seconds (s.to.all_as_seconds())
 		);
 }
+
+
+void
+StringTextFileDecoder::update_position ()
+{
+	if (_next < _subtitles.size()) {
+		only_text()->maybe_set_position(
+			ContentTime::from_seconds(_subtitles[_next].from.all_as_seconds())
+			);
+	}
+}
+