projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up test film naming.
[dcpomatic.git]
/
src
/
lib
/
job.h
diff --git
a/src/lib/job.h
b/src/lib/job.h
index 802bf468da24d71a723fc31929d1fcdd0810cca0..6b2b69b9dc52b6bdb68ed808a5d327290d2d5c83 100644
(file)
--- a/
src/lib/job.h
+++ b/
src/lib/job.h
@@
-39,7
+39,7
@@
class Options;
class Job : public boost::enable_shared_from_this<Job>
{
public:
class Job : public boost::enable_shared_from_this<Job>
{
public:
- Job (boost::shared_ptr<const FilmState> s,
boost::shared_ptr<const Options> o, Log* l
);
+ Job (boost::shared_ptr<const FilmState> s,
Log* l, boost::shared_ptr<Job> req
);
/** @return user-readable name of this job */
virtual std::string name () const = 0;
/** @return user-readable name of this job */
virtual std::string name () const = 0;
@@
-48,6
+48,7
@@
public:
void start ();
void start ();
+ bool is_new () const;
bool running () const;
bool finished () const;
bool finished_ok () const;
bool running () const;
bool finished () const;
bool finished_ok () const;
@@
-66,6
+67,10
@@
public:
void emit_finished ();
void emit_finished ();
+ boost::shared_ptr<Job> required () const {
+ return _required;
+ }
+
/** Emitted from the GUI thread */
sigc::signal0<void> Finished;
/** Emitted from the GUI thread */
sigc::signal0<void> Finished;
@@
-86,8
+91,6
@@
protected:
/** FilmState for this job */
boost::shared_ptr<const FilmState> _fs;
/** FilmState for this job */
boost::shared_ptr<const FilmState> _fs;
- /** options in use for this job */
- boost::shared_ptr<const Options> _opt;
/** a log that this job can write to */
Log* _log;
/** a log that this job can write to */
Log* _log;
@@
-95,6
+98,8
@@
private:
void run_wrapper ();
void run_wrapper ();
+ boost::shared_ptr<Job> _required;
+
/** mutex for _state and _error */
mutable boost::mutex _state_mutex;
/** current state of the job */
/** mutex for _state and _error */
mutable boost::mutex _state_mutex;
/** current state of the job */