summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-04-05 22:25:03 +0200
committerCarl Hetherington <cth@carlh.net>2023-04-05 22:25:03 +0200
commit577602f032c0a129612efc8015f846f4bf6e64c9 (patch)
tree5753d7ded6800d7b3b5bdcf488c26227e85dbc20 /src
parent63b62282a4ca242ca3d2637941ad726199a9f3e0 (diff)
Don't add fonts to SMPTE closed caption MXFs (#2505).
Diffstat (limited to 'src')
-rw-r--r--src/lib/reel_writer.cc22
1 files changed, 12 insertions, 10 deletions
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));
+ }
}
}