diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-12-12 00:51:56 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-02-18 00:41:34 +0100 |
| commit | ac8e1c0859f9bac157c158ef189f9c1baf43437f (patch) | |
| tree | b26324ae2d28fbaa5f3aa6f84089c90f62c8fdcf /src/lib/dcp_subtitle_decoder.cc | |
| parent | 5b3311e613d345e4c9d78c11dedd405ffc3f21ae (diff) | |
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.
Diffstat (limited to 'src/lib/dcp_subtitle_decoder.cc')
| -rw-r--r-- | src/lib/dcp_subtitle_decoder.cc | 8 |
1 files changed, 2 insertions, 6 deletions
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(); |