X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.cc;h=d95f95a2481ba860ae4ee0c304d3190cf09f53f9;hb=bcc4e2f7dc4cd5658e199ddacb7202b00ec72cf1;hp=5fcb7086cf4bf586170ed2a74e8b2cff4f1213e7;hpb=5892dc2cefde50516c27a3f630ee9fb483d07d20;p=dcpomatic.git

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 5fcb7086c..d95f95a24 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -46,7 +46,6 @@ JobManager* JobManager::_instance = 0;
 JobManager::JobManager ()
 	: _terminate (false)
 	, _paused (false)
-	, _scheduler (0)
 {
 
 }
@@ -54,9 +53,9 @@ JobManager::JobManager ()
 void
 JobManager::start ()
 {
-	_scheduler = new boost::thread (boost::bind (&JobManager::scheduler, this));
+	_scheduler = boost::thread (boost::bind(&JobManager::scheduler, this));
 #ifdef DCPOMATIC_LINUX
-	pthread_setname_np (_scheduler->native_handle(), "job-scheduler");
+	pthread_setname_np (_scheduler.native_handle(), "job-scheduler");
 #endif
 }
 
@@ -72,16 +71,13 @@ JobManager::~JobManager ()
 		_empty_condition.notify_all ();
 	}
 
-	if (_scheduler) {
-		/* Ideally this would be a DCPOMATIC_ASSERT(_scheduler->joinable()) but we
-		   can't throw exceptions from a destructor.
-		*/
-		if (_scheduler->joinable ()) {
-			_scheduler->join ();
+	if (_scheduler.joinable()) {
+		try {
+			_scheduler.join();
+		} catch (...) {
+
 		}
 	}
-
-	delete _scheduler;
 }
 
 shared_ptr<Job>
@@ -137,8 +133,8 @@ bool
 JobManager::errors () const
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	for (list<shared_ptr<Job> >::const_iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
-		if ((*i)->finished_in_error ()) {
+	BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+		if (i->finished_in_error ()) {
 			return true;
 		}
 	}
@@ -153,15 +149,12 @@ JobManager::scheduler ()
 
 		boost::mutex::scoped_lock lm (_mutex);
 
-		optional<string> active_job;
-
 		while (true) {
 			bool have_new = false;
 			bool have_running = false;
 			BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
 				if (i->running()) {
 					have_running = true;
-					active_job = i->json_name();
 				}
 				if (i->is_new()) {
 					have_new = true;
@@ -183,23 +176,24 @@ JobManager::scheduler ()
 			if (i->is_new()) {
 				_connections.push_back (i->FinishedImmediate.connect(bind(&JobManager::job_finished, this)));
 				i->start ();
+				emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, i->json_name()));
+				_last_active_job = i->json_name ();
 				/* Only start one job at once */
 				break;
 			}
 		}
-
-		lm.unlock ();
-
-		if (active_job != _last_active_job) {
-			emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, active_job));
-			_last_active_job = active_job;
-		}
 	}
 }
 
 void
 JobManager::job_finished ()
 {
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, optional<string>()));
+		_last_active_job = optional<string>();
+	}
+
 	_empty_condition.notify_all ();
 }
 
@@ -235,7 +229,7 @@ JobManager::analyse_audio (
 
 		BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
 			shared_ptr<AnalyseAudioJob> a = dynamic_pointer_cast<AnalyseAudioJob> (i);
-			if (a && a->playlist () == playlist) {
+			if (a && a->path() == film->audio_analysis_path(playlist)) {
 				i->when_finished (connection, ready);
 				return;
 			}
@@ -250,6 +244,7 @@ JobManager::analyse_audio (
 		job.reset (new AnalyseAudioJob (film, playlist, from_zero));
 		connection = job->Finished.connect (ready);
 		_jobs.push_back (job);
+		_empty_condition.notify_all ();
 	}
 
 	emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (job)));