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

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 02973a186..9cc10d735 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -49,10 +49,10 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
 using boost::bind;
+using namespace dcpomatic;
 
 Hints::Hints (weak_ptr<const Film> film)
 	: _film (film)
-	, _thread (0)
 	, _long_ccap (false)
 	, _overlap_ccap (false)
 	, _too_many_ccap_lines (false)
@@ -64,27 +64,22 @@ Hints::Hints (weak_ptr<const Film> film)
 void
 Hints::start ()
 {
-	_thread = new boost::thread (bind(&Hints::thread, this));
+	_thread = boost::thread (bind(&Hints::thread, this));
 }
 
 Hints::~Hints ()
 {
-	if (!_thread) {
+	if (!_thread.joinable()) {
 		return;
 	}
 
 	try {
-		{
-			boost::mutex::scoped_lock lm (_mutex);
-			_stop = true;
-		}
-		_thread->interrupt ();
-		_thread->join ();
+		_stop = true;
+		_thread.interrupt ();
+		_thread.join ();
 	} catch (...) {
 
 	}
-
-	delete _thread;
 }
 
 void
@@ -116,7 +111,7 @@ Hints::thread ()
 	}
 
 	if (film->audio_channels() < 6) {
-		hint (_("Your DCP has fewer than 6 audio channels.  This may cause problems on some projectors."));
+		hint (_("Your DCP has fewer than 6 audio channels.  This may cause problems on some projectors.  You may want to set the DCP to have 6 channels.  It does not matter if your content has fewer channels, as DCP-o-matic will fill the extras with silence."));
 	}
 
 	AudioProcessor const * ap = film->audio_processor();
@@ -124,27 +119,27 @@ 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) {
-			Ratio const * r = i->video->scale().ratio ();
+			Ratio const * r = Ratio::nearest_from_ratio(i->video->scaled_size(film->frame_size()).ratio());
 			if (r && r->id() == "239") {
 				++scope;
-			} else if (r && r->id() != "239" && r->id() != "190") {
-				++flat_or_narrower;
+			} else if (r && r->id() != "239" && r->id() != "235" && r->id() != "190") {
+				++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 narrower than 1.90:1 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") {
@@ -240,7 +235,7 @@ Hints::thread ()
 
 			for (size_t i = 0; i < sample_peak.size(); ++i) {
 				float const peak = max (sample_peak[i].peak, true_peak.empty() ? 0 : true_peak[i]);
-				float const peak_dB = 20 * log10 (peak) + an->gain_correction (film->playlist ());
+				float const peak_dB = linear_to_db(peak) + an->gain_correction(film->playlist());
 				if (peak_dB > -3) {
 					ch += dcp::raw_convert<string> (short_audio_channel_name (i)) + ", ";
 				}
@@ -264,7 +259,7 @@ Hints::thread ()
 
 	emit (bind(boost::ref(Progress), _("Examining closed captions")));
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	shared_ptr<Player> player (new Player(film));
 	player->set_ignore_video ();
 	player->set_ignore_audio ();
 	player->Text.connect (bind(&Hints::text, this, _1, _2, _4));
@@ -272,20 +267,21 @@ Hints::thread ()
 	struct timeval last_pulse;
 	gettimeofday (&last_pulse, 0);
 
-	while (!player->pass()) {
+	try {
+		while (!player->pass()) {
 
-		struct timeval now;
-		gettimeofday (&now, 0);
-		if ((seconds(now) - seconds(last_pulse)) > 1) {
-			{
-				boost::mutex::scoped_lock lm (_mutex);
+			struct timeval now;
+			gettimeofday (&now, 0);
+			if ((seconds(now) - seconds(last_pulse)) > 1) {
 				if (_stop) {
 					break;
 				}
+				emit (bind (boost::ref(Pulse)));
+				last_pulse = now;
 			}
-			emit (bind (boost::ref(Pulse)));
-			last_pulse = now;
 		}
+	} catch (...) {
+		store_current ();
 	}
 
 	emit (bind(boost::ref(Finished)));
@@ -320,9 +316,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;