X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.cc;h=358820c6a3c35a0ff88d3a295f2c3566435a58e1;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=44c81e725aafb8f439fa30eb066b7b840dfc84e7;hpb=7dad3914a40ba78b8a1964a0b27f88da0ff802d7;p=dcpomatic.git

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 44c81e725..358820c6a 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,6 +26,7 @@
 #include "job.h"
 #include "cross.h"
 #include "analyse_audio_job.h"
+#include "analyse_subtitles_job.h"
 #include "film.h"
 #include <boost/thread.hpp>
 #include <boost/foreach.hpp>
@@ -34,10 +35,10 @@
 using std::string;
 using std::list;
 using std::cout;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::function;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using boost::bind;
 
@@ -46,7 +47,6 @@ JobManager* JobManager::_instance = 0;
 JobManager::JobManager ()
 	: _terminate (false)
 	, _paused (false)
-	, _scheduler (0)
 {
 
 }
@@ -54,14 +54,16 @@ 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
 }
 
 JobManager::~JobManager ()
 {
+	boost::this_thread::disable_interruption dis;
+
 	BOOST_FOREACH (boost::signals2::connection& i, _connections) {
 		i.disconnect ();
 	}
@@ -72,16 +74,9 @@ 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 ();
-		}
-	}
-
-	delete _scheduler;
+	try {
+		_scheduler.join();
+	} catch (...) {}
 }
 
 shared_ptr<Job>
@@ -153,15 +148,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 +175,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 +228,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->finished_cancelled()) {
 				i->when_finished (connection, ready);
 				return;
 			}
@@ -256,6 +249,42 @@ JobManager::analyse_audio (
 	emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (job)));
 }
 
+
+void
+JobManager::analyse_subtitles (
+	shared_ptr<const Film> film,
+	shared_ptr<Content> content,
+	boost::signals2::connection& connection,
+	function<void()> ready
+	)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+
+		BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+			shared_ptr<AnalyseSubtitlesJob> a = dynamic_pointer_cast<AnalyseSubtitlesJob> (i);
+			if (a && a->path() == film->subtitle_analysis_path(content)) {
+				i->when_finished (connection, ready);
+				return;
+			}
+		}
+	}
+
+	shared_ptr<AnalyseSubtitlesJob> job;
+
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+
+		job.reset (new AnalyseSubtitlesJob(film, content));
+		connection = job->Finished.connect (ready);
+		_jobs.push_back (job);
+		_empty_condition.notify_all ();
+	}
+
+	emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (job)));
+}
+
+
 void
 JobManager::increase_priority (shared_ptr<Job> job)
 {