From: Carl Hetherington <cth@carlh.net>
Date: Wed, 1 Jun 2022 10:32:10 +0000 (+0200)
Subject: In-line a call to emit_plain_start() so it's less confusing.
X-Git-Tag: v2.16.14~24
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ab03306fdc02e49b0a3d5b45f103d317ff6611e5

In-line a call to emit_plain_start() so it's less confusing.
---

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;
 }