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-06 23:25:56 +0200
commit0bf51fd49a7d17657234d169e5721a9fe7cd4222 (patch)
tree7f6c8e5bb49a2f9024176c971f338c9c3288e4b1
parent3da252052c781986b7e1cc804f8b282f14b907ac (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;
}