Merge master.

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

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index 0040568c66a5958bb497b86e83e92deba10655da..f0673df1531bd933d0ebb6662795e20e18cc9a84 100644 (file)
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -23,9 +23,11 @@
 
 #include <list>
 #include <boost/thread/mutex.hpp>
+#include <boost/thread.hpp>
 #include <boost/signals2.hpp>
 
 class Job;
+extern void wait_for_jobs ();
 
 /** @class JobManager
  *  @brief A simple scheduler for jobs.
@@ -43,18 +45,22 @@ public:
        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;
 };