From 5e7ec41119961114a9b4df90d1c9ced580667f54 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 12 Dec 2022 00:51:56 +0100
Subject: Support the 2014 version of SMPTE 428-7 in render_text.cc and use it
 when placing subtitles (e.g. SRT).  Also default to outputting 2014-era
 alignment.

---
 src/lib/dcp_subtitle_decoder.cc | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/lib/dcp_subtitle_decoder.cc')

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 617f7ec53..fa92193a5 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -47,11 +47,7 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<
 	_subtitles = asset->subtitles ();
 	_next = _subtitles.begin ();
 
-	if (dynamic_pointer_cast<dcp::InteropSubtitleAsset>(asset)) {
-		_standard = dcp::Standard::INTEROP;
-	} else {
-		_standard = dcp::Standard::SMPTE;
-	}
+	_subtitle_standard = asset->subtitle_standard();
 
 	text.push_back (make_shared<TextDecoder>(this, content->only_text()));
 	update_position();
@@ -109,7 +105,7 @@ DCPSubtitleDecoder::pass ()
 		}
 	}
 
-	only_text()->emit_plain(p, s, _standard);
+	only_text()->emit_plain(p, s, _subtitle_standard);
 
 	update_position();
 
-- 
cgit v1.2.3