summaryrefslogtreecommitdiff
path: root/src/lib/dcp_examiner.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-03-06 01:15:46 +0100
committerCarl Hetherington <cth@carlh.net>2024-03-11 09:24:17 +0100
commit35ec77fa0e12603ceacbcf0083f6d871ececbfe5 (patch)
tree3c226014d42d0829179897449fbccc3652967ef8 /src/lib/dcp_examiner.cc
parent8e9da24b4fa8a254d87f293072a4bf44da36b8fa (diff)
Add a temporary to reduce some boilerplate.
Diffstat (limited to 'src/lib/dcp_examiner.cc')
-rw-r--r--src/lib/dcp_examiner.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 88c9a5b70..22e9f9b50 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -195,17 +195,17 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
}
}
- if (reel->main_subtitle()) {
- if (!reel->main_subtitle()->asset_ref().resolved()) {
- LOG_GENERAL("Main subtitle %1 of reel %2 is missing", reel->main_subtitle()->id(), reel->id());
+ if (auto sub = reel->main_subtitle()) {
+ if (!sub->asset_ref().resolved()) {
+ LOG_GENERAL("Main subtitle %1 of reel %2 is missing", sub->id(), reel->id());
_needs_assets = true;
} else {
- LOG_GENERAL("Main subtitle %1 of reel %2 found", reel->main_subtitle()->id(), reel->id());
+ LOG_GENERAL("Main subtitle %1 of reel %2 found", sub->id(), reel->id());
_text_count[TextType::OPEN_SUBTITLE] = 1;
- _open_subtitle_language = try_to_parse_language(reel->main_subtitle()->language());
+ _open_subtitle_language = try_to_parse_language(sub->language());
- auto asset = reel->main_subtitle()->asset();
+ auto asset = sub->asset();
for (auto const& font: asset->font_data()) {
_fonts.push_back({reel_index, asset->id(), make_shared<dcpomatic::Font>(font.first, font.second)});
}