X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fstring_text_file_decoder.cc;h=8c9880b0c7118881942b3cebb2ab76991e25bf06;hb=137b2b1b440b5594b4d371c10884acd0a90df6bf;hp=a81f2592da4ff36797694c596f267f30d8637beb;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc
index a81f2592d..8c9880b0c 100644
--- a/src/lib/string_text_file_decoder.cc
+++ b/src/lib/string_text_file_decoder.cc
@@ -35,15 +35,16 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 
-StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const StringTextFileContent> content, shared_ptr<Log> log)
-	: StringTextFile (content)
+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;
 	}
-	caption.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_caption(), log, first)));
+	text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
 }
 
 void
@@ -73,7 +74,7 @@ StringTextFileDecoder::pass ()
 	}
 
 	ContentTimePeriod const p = content_time_period (_subtitles[_next]);
-	only_caption()->emit_plain (p, _subtitles[_next]);
+	only_text()->emit_plain (p, _subtitles[_next]);
 
 	++_next;
 	return false;