X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhints.cc;h=df29a333699de0cabee2f9588e1ac38aaae3148a;hb=4285355ff2bec853924647f0523d121860fe64e3;hp=02973a18654a32fe4be32334c58703efd45e827a;hpb=5730c435e81f9001eeda0a74b6a5c65be148c9af;p=dcpomatic.git

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 02973a186..df29a3336 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -124,7 +124,7 @@ Hints::thread ()
 		hint (_("You are using DCP-o-matic's stereo-to-5.1 upmixer.  This is experimental and may result in poor-quality audio.  If you continue, you should listen to the resulting DCP in a cinema to make sure that it sounds good."));
 	}
 
-	int flat_or_narrower = 0;
+	int narrower_than_scope = 0;
 	int scope = 0;
 	BOOST_FOREACH (shared_ptr<const Content> i, content) {
 		if (i->video) {
@@ -132,19 +132,19 @@ Hints::thread ()
 			if (r && r->id() == "239") {
 				++scope;
 			} else if (r && r->id() != "239" && r->id() != "190") {
-				++flat_or_narrower;
+				++narrower_than_scope;
 			}
 		}
 	}
 
 	string const film_container = film->container()->id();
 
-	if (scope && !flat_or_narrower && film_container == "185") {
+	if (scope && !narrower_than_scope && film_container == "185") {
 		hint (_("All of your content is in Scope (2.39:1) but your DCP's container is Flat (1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" tab."));
 	}
 
-	if (!scope && flat_or_narrower && film_container == "239") {
-		hint (_("All of your content is at 1.85:1 or narrower but your DCP's container is Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) frame.  You may prefer to set your DCP's container to Flat (1.85:1) in the \"DCP\" tab."));
+	if (!scope && narrower_than_scope && film_container == "239") {
+		hint (_("All of your content is 2.35:1 or narrower but your DCP's container is Scope (2.39:1).  This will pillar-box your content.  You may prefer to set your DCP's container to have the same ratio as your content."));
 	}
 
 	if (film_container != "185" && film_container != "239" && film_container != "190") {
@@ -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;