From 3271345e7b35c6fdbe85cb3a14337d10973370be Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 29 Mar 2019 00:41:48 +0000 Subject: Don't warn about overlapping CCAPs in SMPTE DCPs (part of #1516). --- src/lib/hints.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/hints.cc b/src/lib/hints.cc index c1d90abcd..df29a3336 100644 --- a/src/lib/hints.cc +++ b/src/lib/hints.cc @@ -320,9 +320,13 @@ Hints::text (PlayerText text, TextType type, DCPTimePeriod period) _too_many_ccap_lines = true; } - if (!_overlap_ccap && _last && _last->overlap(period)) { + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + + /* XXX: maybe overlapping closed captions (i.e. different languages) are OK with Interop? */ + if (film->interop() && !_overlap_ccap && _last && _last->overlap(period)) { _overlap_ccap = true; - hint (_("You have overlapping closed captions, which are not allowed.")); + hint (_("You have overlapping closed captions, which are not allowed in Interop DCPs. Change your DCP standard to SMPTE.")); } _last = period; -- cgit v1.2.3