diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-02-27 15:00:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-02-27 15:00:34 +0100 |
| commit | e163200eaaf65c63d5105949432140f4084de037 (patch) | |
| tree | 7c35507485aa46b79627c10a215023311e41b6bb /src/lib/dcp_subtitle_decoder.cc | |
| parent | 8ff6586d568c4a2b0a2ac24e690d172f4c01e3c4 (diff) | |
| parent | f4f6f4828430dc72e0276c245d32fde228aaa176 (diff) | |
Merge branch '2389-vpos'
Here we are trying to fix a variety of confusions related to vertical
subtitle position (#2389).
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(); |