projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b00df7c
)
Rename some variables.
author
Carl Hetherington
<cth@carlh.net>
Wed, 1 Jun 2022 10:31:02 +0000
(12:31 +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 2fdcab89e0451eb2464552a260daad24fc2169a2..d485ef64b837e03bee5261cc5f21923a216bafb6 100644
(file)
--- a/
src/lib/text_decoder.cc
+++ b/
src/lib/text_decoder.cc
@@
-117,12
+117,12
@@
TextDecoder::emit_plain_start (ContentTime from, vector<dcp::SubtitleString> sub
void
void
-TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
+TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub
_sub
title)
{
/* See if our next subtitle needs to be vertically placed on screen by us */
bool needs_placement = false;
optional<int> bottom_line;
{
/* See if our next subtitle needs to be vertically placed on screen by us */
bool needs_placement = false;
optional<int> bottom_line;
- for (auto line: subtitle.lines) {
+ for (auto line: sub
_sub
title.lines) {
if (!line.vertical_position.reference || (line.vertical_position.line && !line.vertical_position.lines) || line.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) {
needs_placement = true;
if (!bottom_line || bottom_line.get() < line.vertical_position.line.get()) {
if (!line.vertical_position.reference || (line.vertical_position.line && !line.vertical_position.lines) || line.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) {
needs_placement = true;
if (!bottom_line || bottom_line.get() < line.vertical_position.line.get()) {
@@
-133,7
+133,7
@@
TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
/* Find the lowest proportional position */
optional<float> lowest_proportional;
/* Find the lowest proportional position */
optional<float> lowest_proportional;
- for (auto line: subtitle.lines) {
+ for (auto line: sub
_sub
title.lines) {
if (line.vertical_position.proportional) {
if (!lowest_proportional) {
lowest_proportional = line.vertical_position.proportional;
if (line.vertical_position.proportional) {
if (!lowest_proportional) {
lowest_proportional = line.vertical_position.proportional;
@@
-143,8
+143,8
@@
TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
}
}
}
}
- vector<dcp::SubtitleString>
out
;
- for (auto line: subtitle.lines) {
+ vector<dcp::SubtitleString>
dcp_subtitles
;
+ for (auto line: sub
_sub
title.lines) {
for (auto block: line.blocks) {
if (!block.font_size.specified()) {
for (auto block: line.blocks) {
if (!block.font_size.specified()) {
@@
-233,7
+233,7
@@
TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
content by the other emit_plain_start() above.
*/
content by the other emit_plain_start() above.
*/
-
out.push_back
(
+
dcp_subtitles.push_back
(
dcp::SubtitleString (
string(TEXT_FONT_ID),
block.italic,
dcp::SubtitleString (
string(TEXT_FONT_ID),
block.italic,
@@
-268,7
+268,7
@@
TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
}
/* Pass these subs through the other emit_plain_start so that they get their forced settings applied */
}
/* Pass these subs through the other emit_plain_start so that they get their forced settings applied */
- emit_plain_start (from,
out
);
+ emit_plain_start (from,
dcp_subtitles
);
}
}