From: Carl Hetherington <cth@carlh.net>
Date: Wed, 5 Apr 2023 20:25:03 +0000 (+0200)
Subject: Don't add fonts to SMPTE closed caption MXFs (#2505).
X-Git-Tag: v2.16.52~7
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=577602f032c0a129612efc8015f846f4bf6e64c9

Don't add fonts to SMPTE closed caption MXFs (#2505).
---

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 8bd15a575..5d9f4dae0 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -491,16 +491,18 @@ maybe_add_text (
 	shared_ptr<Result> reel_asset;
 
 	if (asset) {
-		if (film->interop()) {
-			if (chosen_interop_font) {
-				/* We only add one font, as Interop will ignore subsequent ones (and some validators will
-				 * complain if they are even present)
-				 */
-				asset->add_font(fonts.get(chosen_interop_font), chosen_interop_font->data().get_value_or(default_font));
-			}
-		} else {
-			for (auto const& font: fonts.map()) {
-				asset->add_font(font.second, font.first->data().get_value_or(default_font));
+		if (!std::is_same<Result, dcp::ReelClosedCaptionAsset>::value) {
+			if (film->interop()) {
+				if (chosen_interop_font) {
+					/* We only add one font, as Interop will ignore subsequent ones (and some validators will
+					 * complain if they are even present)
+					 */
+					asset->add_font(fonts.get(chosen_interop_font), chosen_interop_font->data().get_value_or(default_font));
+				}
+			} else {
+				for (auto const& font: fonts.map()) {
+					asset->add_font(font.second, font.first->data().get_value_or(default_font));
+				}
 			}
 		}