1 files changed, 16 insertions, 20 deletions

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index fa02fd370..a841fa60b 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -30,7 +30,9 @@
 
 using std::string;
 using std::list;
+using std::cout;
 using boost::shared_ptr;
+using boost::weak_ptr;
 
 JobManager* JobManager::_instance = 0;
 
@@ -43,19 +45,16 @@ JobManager::JobManager ()
 shared_ptr<Job>
 JobManager::add (shared_ptr<Job> j)
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	_jobs.push_back (j);
-	return j;
-}
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_jobs.push_back (j);
+	}
 
-void
-JobManager::add_after (shared_ptr<Job> after, 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);
+	if (ui_signaller) {
+		ui_signaller->emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
+	}
+	
+	return j;
 }
 
 list<shared_ptr<Job> >
@@ -111,13 +110,10 @@ JobManager::scheduler ()
 				}
 				
 				if ((*i)->is_new()) {
-					shared_ptr<Job> r = (*i)->required ();
-					if (!r || r->finished_ok ()) {
-						(*i)->start ();
-
-						/* Only start one job at once */
-						break;
-					}
+					(*i)->start ();
+					
+					/* Only start one job at once */
+					break;
 				}
 			}
 		}
@@ -129,7 +125,7 @@ JobManager::scheduler ()
 			}
 		}
 
-		dvdomatic_sleep (1);
+		dcpomatic_sleep (1);
 	}
 }