diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-12-23 19:45:05 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-01-04 23:35:43 +0100 |
| commit | a7fa260fb46d40bca1e0faf3210a0c260316a8ad (patch) | |
| tree | 8d620f0200088e386d6a0a46b2d282561c7fcaec | |
| parent | 1c1395154a67ddad9c576d613138897b39851e08 (diff) | |
Remove checks for referenced DCPs having content in all reels (#2694).
I can't see why this was done, other than perhaps to avoid output
with no subtitles in a reel (which is not allowed by Bv2.1). But
I think even if that does still happen we could make our own reels
for the missing ones.
| -rw-r--r-- | src/lib/dcp_content.cc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 2d441353a..8d27406fe 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -720,14 +720,6 @@ DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) c return false; } - for (auto i: decoder->reels()) { - if (!i->main_sound()) { - /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - why_not = _("it does not have sound in all its reels."); - return false; - } - } - /// TRANSLATORS: this string will follow "Cannot reference this DCP: " return can_reference( film, [](shared_ptr<const Content> c) { @@ -755,22 +747,13 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri for (auto i: decoder->reels()) { if (type == TextType::OPEN_SUBTITLE) { - if (!i->main_subtitle()) { - /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - why_not = _("it does not have open subtitles in all its reels."); - return false; - } else if (i->main_subtitle()->entry_point().get_value_or(0) != 0) { + if (i->main_subtitle()->entry_point().get_value_or(0) != 0) { /// TRANSLATORS: this string will follow "Cannot reference this DCP: " why_not = _("one of its subtitle reels has a non-zero entry point so it must be re-written."); return false; } } if (type == TextType::CLOSED_CAPTION) { - if (i->closed_captions().empty()) { - /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - why_not = _("it does not have closed captions in all its reels."); - return false; - } for (auto j: i->closed_captions()) { if (j->entry_point().get_value_or(0) != 0) { /// TRANSLATORS: this string will follow "Cannot reference this DCP: " |