summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-06-01 12:32:10 +0200
committerCarl Hetherington <cth@carlh.net>2022-06-07 17:01:06 +0200
commitab03306fdc02e49b0a3d5b45f103d317ff6611e5 (patch)
tree545e05094727f50de3e92bd03379ff66fb9d980b
parent76bee46d6baa198107b197b821ad5b2d5eb5947f (diff)
In-line a call to emit_plain_start() so it's less confusing.
-rw-r--r--src/lib/text_decoder.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index d485ef64b..c655fb5b5 100644
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -267,8 +267,13 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
}
}
- /* Pass these subs through the other emit_plain_start so that they get their forced settings applied */
- emit_plain_start (from, dcp_subtitles);
+ for (auto& subtitle: dcp_subtitles) {
+ subtitle.set_text(escape_text(subtitle.text()));
+ set_forced_appearance(content(), subtitle);
+ }
+
+ PlainStart(ContentStringText(from, dcp_subtitles));
+ _position = from;
}