X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fhints.cc;h=3edceeee371bbe4978765bf0f96b2aef14dd5102;hp=df29a333699de0cabee2f9588e1ac38aaae3148a;hb=bcc4e2f7dc4cd5658e199ddacb7202b00ec72cf1;hpb=3271345e7b35c6fdbe85cb3a14337d10973370be

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index df29a3336..3edceeee3 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();
@@ -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)) + ", ";
 				}
@@ -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)));