From 76bee46d6baa198107b197b821ad5b2d5eb5947f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 1 Jun 2022 12:31:02 +0200 Subject: [PATCH] Rename some variables. --- src/lib/text_decoder.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 2fdcab89e..d485ef64b 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -117,12 +117,12 @@ TextDecoder::emit_plain_start (ContentTime from, vector sub void -TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle) +TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subtitle) { /* See if our next subtitle needs to be vertically placed on screen by us */ bool needs_placement = false; optional bottom_line; - for (auto line: subtitle.lines) { + for (auto line: sub_subtitle.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()) { @@ -133,7 +133,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle) /* Find the lowest proportional position */ optional lowest_proportional; - for (auto line: subtitle.lines) { + for (auto line: sub_subtitle.lines) { 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 out; - for (auto line: subtitle.lines) { + vector dcp_subtitles; + for (auto line: sub_subtitle.lines) { 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. */ - out.push_back ( + dcp_subtitles.push_back( 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 */ - emit_plain_start (from, out); + emit_plain_start (from, dcp_subtitles); } -- 2.30.2