X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.cc;h=f31a00a18b33f0bce674f0406b06197f8fbea691;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=507bf6791ba33e608e94bfe49f53b9066d409f39;hpb=e2463f3796bcdb55cba6e81a9bcede7041df7236;p=dcpomatic.git

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 507bf6791..f31a00a18 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -26,36 +26,46 @@
 #include "job_manager.h"
 #include "job.h"
 #include "cross.h"
-#include "ui_signaller.h"
 
 using std::string;
 using std::list;
+using std::cout;
 using boost::shared_ptr;
+using boost::weak_ptr;
 
 JobManager* JobManager::_instance = 0;
 
 JobManager::JobManager ()
-	: _last_active_jobs (false)
+	: _terminate (false)
+	, _last_active_jobs (false)
+	, _scheduler (new boost::thread (boost::bind (&JobManager::scheduler, this)))
 {
-	boost::thread (boost::bind (&JobManager::scheduler, this));
+
 }
 
-shared_ptr<Job>
-JobManager::add (shared_ptr<Job> j)
+JobManager::~JobManager ()
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	_jobs.push_back (j);
-	return j;
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_terminate = true;
+	}
+
+	if (_scheduler->joinable ()) {
+		_scheduler->join ();
+	}
 }
 
-void
-JobManager::add_after (shared_ptr<Job> after, shared_ptr<Job> j)
+shared_ptr<Job>
+JobManager::add (shared_ptr<Job> j)
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	list<shared_ptr<Job> >::iterator i = find (_jobs.begin(), _jobs.end(), after);
-	assert (i != _jobs.end ());
-	++i;
-	_jobs.insert (i, j);
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_jobs.push_back (j);
+	}
+
+	emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
+
+	return j;
 }
 
 list<shared_ptr<Job> >
@@ -88,46 +98,47 @@ JobManager::errors () const
 	}
 
 	return false;
-}	
+}
 
 void
 JobManager::scheduler ()
 {
-	while (1) {
+	while (true) {
 
 		bool active_jobs = false;
 
 		{
 			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;
 				}
-				
+
 				if ((*i)->running ()) {
 					/* Something is already happening */
 					break;
 				}
-				
+
 				if ((*i)->is_new()) {
-					shared_ptr<Job> r = (*i)->required ();
-					if (!r || r->finished_ok ()) {
-						(*i)->start ();
+					(*i)->start ();
 
-						/* Only start one job at once */
-						break;
-					}
+					/* Only start one job at once */
+					break;
 				}
 			}
 		}
 
 		if (active_jobs != _last_active_jobs) {
 			_last_active_jobs = active_jobs;
-			ui_signaller->emit (boost::bind (boost::ref (ActiveJobsChanged), active_jobs));
+			emit (boost::bind (boost::ref (ActiveJobsChanged), active_jobs));
 		}
 
-		dvdomatic_sleep (1);
+		dcpomatic_sleep (1);
 	}
 }
 
@@ -140,3 +151,10 @@ JobManager::instance ()
 
 	return _instance;
 }
+
+void
+JobManager::drop ()
+{
+	delete _instance;
+	_instance = 0;
+}