X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.h;h=d0e83e26f6c13b369ba524d421c6bcd72d25e7b5;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=d1d33cfc2ce7e7dc3ac4693d579d7309e0ec30e5;hpb=922361469072474da4294a90f1436cd0117cb90f;p=dcpomatic.git

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index d1d33cfc2..d0e83e26f 100644
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -21,35 +21,47 @@
  *  @brief A simple scheduler for jobs.
  */
 
-#include <list>
+#include "signaller.h"
 #include <boost/thread/mutex.hpp>
+#include <boost/thread.hpp>
+#include <boost/signals2.hpp>
+#include <list>
 
 class Job;
+extern void wait_for_jobs ();
 
 /** @class JobManager
  *  @brief A simple scheduler for jobs.
- *
- *  JobManager simply keeps a list of pending jobs, and assumes that all the jobs
- *  are sufficiently CPU intensive that there is no point running them in parallel;
- *  so jobs are just run one after the other.
  */
-class JobManager
+class JobManager : public Signaller, public boost::noncopyable
 {
 public:
 
-	void add (boost::shared_ptr<Job>);
-	void add_after (boost::shared_ptr<Job> after, boost::shared_ptr<Job> j);
+	boost::shared_ptr<Job> add (boost::shared_ptr<Job>);
 	std::list<boost::shared_ptr<Job> > get () const;
 	bool work_to_do () const;
+	bool errors () const;
+
+	boost::signals2::signal<void (boost::weak_ptr<Job>)> JobAdded;
+	boost::signals2::signal<void (bool)> ActiveJobsChanged;
 
 	static JobManager* instance ();
+	static void drop ();
 
 private:
+	/* This function is part of the test suite */
+	friend void ::wait_for_jobs ();
+
 	JobManager ();
+	~JobManager ();
 	void scheduler ();
-	
+
 	mutable boost::mutex _mutex;
 	std::list<boost::shared_ptr<Job> > _jobs;
+	bool _terminate;
+
+	bool _last_active_jobs;
+	boost::thread* _scheduler;
 
 	static JobManager* _instance;
 };