summaryrefslogtreecommitdiff
path: root/src/lib/dcp_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-07-29 11:44:05 +0200
committerCarl Hetherington <cth@carlh.net>2020-08-02 21:48:32 +0000
commit768287d3b8fff495f5b86ae9cea750bff7652fe2 (patch)
treefa3f271a249523cdd7c71e55b7a83a0e515edcfe /src/lib/dcp_content.cc
parent5fa8671eb5515a534d3971c249337303cab67740 (diff)
Recover information about closed caption tracks when loading DCPs
so that they can be displayed. Cherry-picked from 09860271bb6d03b3937c08bffb4c672697f6d711 in v2.15.x.
Diffstat (limited to 'src/lib/dcp_content.cc')
-rw-r--r--src/lib/dcp_content.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index ef877a17f..2e93e9ee8 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -226,7 +226,11 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
_name = examiner->name ();
for (int i = 0; i < TEXT_COUNT; ++i) {
for (int j = 0; j < examiner->text_count(static_cast<TextType>(i)); ++j) {
- text.push_back (shared_ptr<TextContent>(new TextContent(this, static_cast<TextType>(i), static_cast<TextType>(i))));
+ shared_ptr<TextContent> c(new TextContent(this, static_cast<TextType>(i), static_cast<TextType>(i)));
+ if (i == TEXT_CLOSED_CAPTION) {
+ c->set_dcp_track (examiner->dcp_text_track(j));
+ }
+ text.push_back (c);
}
}
texts = text.size ();