projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract common code out into kdm_for_screen()
[dcpomatic.git]
/
src
/
lib
/
job_manager.h
diff --git
a/src/lib/job_manager.h
b/src/lib/job_manager.h
index c623b6ef98d7f7fd5831b9644281a10946b58084..dd7a28db208914c3c67e06d09f04d5acd1c96595 100644
(file)
--- a/
src/lib/job_manager.h
+++ b/
src/lib/job_manager.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-26,11
+26,14
@@
#include <boost/thread/mutex.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
+#include <boost/thread/condition.hpp>
#include <list>
class Job;
class Film;
class Playlist;
#include <list>
class Job;
class Film;
class Playlist;
+class Content;
+struct threed_test7;
extern bool wait_for_jobs ();
extern bool wait_for_jobs ();
@@
-41,15
+44,30
@@
class JobManager : public Signaller, public boost::noncopyable
{
public:
boost::shared_ptr<Job> add (boost::shared_ptr<Job>);
{
public:
boost::shared_ptr<Job> add (boost::shared_ptr<Job>);
+ boost::shared_ptr<Job> add_after (boost::shared_ptr<Job> after, boost::shared_ptr<Job> j);
std::list<boost::shared_ptr<Job> > get () const;
bool work_to_do () const;
bool errors () const;
void increase_priority (boost::shared_ptr<Job>);
void decrease_priority (boost::shared_ptr<Job>);
std::list<boost::shared_ptr<Job> > get () const;
bool work_to_do () const;
bool errors () const;
void increase_priority (boost::shared_ptr<Job>);
void decrease_priority (boost::shared_ptr<Job>);
+ void pause ();
+ void resume ();
+ bool paused () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _paused;
+ }
void analyse_audio (
boost::shared_ptr<const Film> film,
boost::shared_ptr<const Playlist> playlist,
void analyse_audio (
boost::shared_ptr<const Film> film,
boost::shared_ptr<const Playlist> playlist,
+ bool from_zero,
+ boost::signals2::connection& connection,
+ boost::function<void()> ready
+ );
+
+ void analyse_subtitles (
+ boost::shared_ptr<const Film> film,
+ boost::shared_ptr<Content> content,
boost::signals2::connection& connection,
boost::function<void()> ready
);
boost::signals2::connection& connection,
boost::function<void()> ready
);
@@
-64,20
+82,26
@@
public:
private:
/* This function is part of the test suite */
friend bool ::wait_for_jobs ();
private:
/* This function is part of the test suite */
friend bool ::wait_for_jobs ();
+ friend struct threed_test7;
JobManager ();
~JobManager ();
void scheduler ();
void start ();
void priority_changed ();
JobManager ();
~JobManager ();
void scheduler ();
void start ();
void priority_changed ();
+ void job_finished ();
mutable boost::mutex _mutex;
mutable boost::mutex _mutex;
+ boost::condition _empty_condition;
/** List of jobs in the order that they will be executed */
std::list<boost::shared_ptr<Job> > _jobs;
/** List of jobs in the order that they will be executed */
std::list<boost::shared_ptr<Job> > _jobs;
+ std::list<boost::signals2::connection> _connections;
bool _terminate;
bool _terminate;
+ bool _paused;
+ boost::shared_ptr<Job> _paused_job;
boost::optional<std::string> _last_active_job;
boost::optional<std::string> _last_active_job;
- boost::thread
*
_scheduler;
+ boost::thread _scheduler;
static JobManager* _instance;
};
static JobManager* _instance;
};