From: Carl Hetherington Date: Wed, 3 Jan 2024 23:40:03 +0000 (+0100) Subject: Add dummy subtitle and closed caption reels even when referencing X-Git-Tag: v2.16.72~50^2~1 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=23b0ff9c475265fb5309d20fe4094f5a96818d22 Add dummy subtitle and closed caption reels even when referencing other DCPs (in a VF) that themselves might have missing subtitles for some reels. --- diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 8863816e8..fbe2d248d 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -41,7 +41,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -930,6 +932,22 @@ void Writer::write (ReferencedReelAsset asset) { _reel_assets.push_back (asset); + + if (dynamic_pointer_cast(asset.asset)) { + _have_subtitles = true; + } else if (auto ccap = dynamic_pointer_cast(asset.asset)) { + /* This feels quite fragile. We have a referenced reel and want to know if it's + * part of a given closed-caption track so that we can fill if it has any + * missing reels. I guess for that purpose almost any DCPTextTrack values are + * fine so long as they are consistent. + */ + DCPTextTrack track; + track.name = ccap->annotation_text().get_value_or(""); + track.language = dcp::LanguageTag(ccap->language().get_value_or("en-US")); + if (_have_closed_captions.find(track) == _have_closed_captions.end()) { + _have_closed_captions.insert(track); + } + } }