projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix FFmpeg subtitle stream serialisation.
[dcpomatic.git]
/
src
/
lib
/
job_manager.h
diff --git
a/src/lib/job_manager.h
b/src/lib/job_manager.h
index 0040568c66a5958bb497b86e83e92deba10655da..b946c1a98e0836893eb758b2d19554d4643871e2 100644
(file)
--- a/
src/lib/job_manager.h
+++ b/
src/lib/job_manager.h
@@
-21,16
+21,19
@@
* @brief A simple scheduler for jobs.
*/
* @brief A simple scheduler for jobs.
*/
-#include
<list>
+#include
"signaller.h"
#include <boost/thread/mutex.hpp>
#include <boost/thread/mutex.hpp>
+#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
+#include <list>
class Job;
class Job;
+extern void wait_for_jobs ();
/** @class JobManager
* @brief A simple scheduler for jobs.
*/
/** @class JobManager
* @brief A simple scheduler for jobs.
*/
-class JobManager : public boost::noncopyable
+class JobManager : public
Signaller, public
boost::noncopyable
{
public:
{
public:
@@
-43,18
+46,22
@@
public:
boost::signals2::signal<void (bool)> ActiveJobsChanged;
static JobManager* instance ();
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 ();
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;
void scheduler ();
mutable boost::mutex _mutex;
std::list<boost::shared_ptr<Job> > _jobs;
+ bool _terminate;
bool _last_active_jobs;
bool _last_active_jobs;
+ boost::thread* _scheduler;
static JobManager* _instance;
};
static JobManager* _instance;
};