Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / src / lib / job_manager.h

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index d0dac7d19369073eda9761b2290b4e272056c786..9d8620cbb58165ef320d40497235a92736e325e6 100644 (file)
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -21,11 +21,13 @@
  *  @brief A simple scheduler for jobs.
  */
 
-#include <list>
 #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.
@@ -50,12 +52,15 @@ private:
        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;
 };