From: Carl Hetherington <cth@carlh.net>
Date: Fri, 29 Mar 2019 00:41:48 +0000 (+0000)
Subject: Don't warn about overlapping CCAPs in SMPTE DCPs (part of #1516).
X-Git-Tag: v2.13.140~2
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=3271345e7b35c6fdbe85cb3a14337d10973370be;hp=1d9bbf7bb0b52d5461719d2d3fe5ea178565e35d;p=dcpomatic.git

Don't warn about overlapping CCAPs in SMPTE DCPs (part of #1516).
---

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<const Film> 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;