X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.cc;h=86e010c106b929d0cb6869026eda4a70baab86e5;hb=aebfa24afe42d80693df66318e5d2818ebf5989b;hp=2b727b0aaa43985942674f07d4f881051369236b;hpb=6bc83f72f12c8513a1e9e9b6fd880697a73f968f;p=dcpomatic.git

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 2b727b0aa..86e010c10 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,27 +21,37 @@
  *  @brief A simple scheduler for jobs.
  */
 
-#include <iostream>
-#include <boost/thread.hpp>
 #include "job_manager.h"
 #include "job.h"
 #include "cross.h"
-#include "ui_signaller.h"
+#include "analyse_audio_job.h"
+#include "film.h"
+#include <boost/thread.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::string;
 using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::weak_ptr;
+using boost::function;
+using boost::dynamic_pointer_cast;
+using boost::optional;
 
 JobManager* JobManager::_instance = 0;
 
 JobManager::JobManager ()
 	: _terminate (false)
-	, _last_active_jobs (false)
-	, _scheduler (new boost::thread (boost::bind (&JobManager::scheduler, this)))
+	, _scheduler (0)
+{
+
+}
+
+void
+JobManager::start ()
 {
-	
+	_scheduler = new boost::thread (boost::bind (&JobManager::scheduler, this));
 }
 
 JobManager::~JobManager ()
@@ -51,9 +61,12 @@ JobManager::~JobManager ()
 		_terminate = true;
 	}
 
-	if (_scheduler->joinable ()) {
+	if (_scheduler) {
+		DCPOMATIC_ASSERT (_scheduler->joinable ());
 		_scheduler->join ();
 	}
+
+	delete _scheduler;
 }
 
 shared_ptr<Job>
@@ -64,10 +77,8 @@ JobManager::add (shared_ptr<Job> j)
 		_jobs.push_back (j);
 	}
 
-	if (ui_signaller) {
-		ui_signaller->emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
-	}
-	
+	emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
+
 	return j;
 }
 
@@ -101,46 +112,43 @@ JobManager::errors () const
 	}
 
 	return false;
-}	
+}
 
 void
 JobManager::scheduler ()
 {
 	while (true) {
 
-		bool active_jobs = false;
+		optional<string> active_job;
 
 		{
 			boost::mutex::scoped_lock lm (_mutex);
 			if (_terminate) {
 				return;
 			}
-			
-			for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
 
-				if (!(*i)->finished ()) {
-					active_jobs = true;
+			BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+
+				if (!i->finished ()) {
+					active_job = i->json_name ();
 				}
-				
-				if ((*i)->running ()) {
+
+				if (i->running ()) {
 					/* Something is already happening */
 					break;
 				}
-				
-				if ((*i)->is_new()) {
-					(*i)->start ();
-					
+
+				if (i->is_new()) {
+					i->start ();
 					/* Only start one job at once */
 					break;
 				}
 			}
 		}
 
-		if (active_jobs != _last_active_jobs) {
-			_last_active_jobs = active_jobs;
-			if (ui_signaller) {
-				ui_signaller->emit (boost::bind (boost::ref (ActiveJobsChanged), active_jobs));
-			}
+		if (active_job != _last_active_job) {
+			emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, active_job));
+			_last_active_job = active_job;
 		}
 
 		dcpomatic_sleep (1);
@@ -152,6 +160,7 @@ JobManager::instance ()
 {
 	if (_instance == 0) {
 		_instance = new JobManager ();
+		_instance->start ();
 	}
 
 	return _instance;
@@ -163,3 +172,36 @@ JobManager::drop ()
 	delete _instance;
 	_instance = 0;
 }
+
+void
+JobManager::analyse_audio (
+	shared_ptr<const Film> film,
+	shared_ptr<const Playlist> playlist,
+	boost::signals2::connection& connection,
+	function<void()> ready
+	)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+
+		BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+			shared_ptr<AnalyseAudioJob> a = dynamic_pointer_cast<AnalyseAudioJob> (i);
+			if (a && a->playlist () == playlist) {
+				i->when_finished (connection, ready);
+				return;
+			}
+		}
+	}
+
+	shared_ptr<AnalyseAudioJob> job;
+
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+
+		job.reset (new AnalyseAudioJob (film, playlist));
+		connection = job->Finished.connect (ready);
+		_jobs.push_back (job);
+	}
+
+	emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (job)));
+}