projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
76bee46
)
In-line a call to emit_plain_start() so it's less confusing.
author
Carl Hetherington
<cth@carlh.net>
Wed, 1 Jun 2022 10:32:10 +0000
(12:32 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 7 Jun 2022 15:01:06 +0000
(17:01 +0200)
src/lib/text_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/text_decoder.cc
b/src/lib/text_decoder.cc
index d485ef64b837e03bee5261cc5f21923a216bafb6..c655fb5b58d5e5b2e208931f27d4ae0e753d9632 100644
(file)
--- 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;
}