projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[dcpomatic.git]
/
src
/
lib
/
job.h
diff --git
a/src/lib/job.h
b/src/lib/job.h
index f32cfa811ad58c19d10c320bcb323120099354ba..c98dbaea15dfb13133611f61727439d332158470 100644
(file)
--- a/
src/lib/job.h
+++ b/
src/lib/job.h
@@
-37,7
+37,7
@@
class Film;
class Job : public boost::enable_shared_from_this<Job>
{
public:
class Job : public boost::enable_shared_from_this<Job>
{
public:
- Job (boost::shared_ptr<Film> s
, boost::shared_ptr<Job> req
);
+ Job (boost::shared_ptr<Film> s);
virtual ~Job() {}
/** @return user-readable name of this job */
virtual ~Job() {}
/** @return user-readable name of this job */
@@
-53,7
+53,8
@@
public:
bool finished_ok () const;
bool finished_in_error () const;
bool finished_ok () const;
bool finished_in_error () const;
- std::string error () const;
+ std::string error_summary () const;
+ std::string error_details () const;
int elapsed_time () const;
virtual std::string status () const;
int elapsed_time () const;
virtual std::string status () const;
@@
-64,10
+65,7
@@
public:
void descend (float);
float overall_progress () const;
void descend (float);
float overall_progress () const;
- boost::shared_ptr<Job> required () const {
- return _required;
- }
-
+ /** Emitted by the JobManagerView from the UI thread */
boost::signals2::signal<void()> Finished;
protected:
boost::signals2::signal<void()> Finished;
protected:
@@
-83,7
+81,7
@@
protected:
};
void set_state (State);
};
void set_state (State);
- void set_error (std::string
e
);
+ void set_error (std::string
s, std::string d
);
/** Film for this job */
boost::shared_ptr<Film> _film;
/** Film for this job */
boost::shared_ptr<Film> _film;
@@
-92,14
+90,13
@@
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 */
State _state;
/** mutex for _state and _error */
mutable boost::mutex _state_mutex;
/** current state of the job */
State _state;
- /** message for an error that has occurred (when state == FINISHED_ERROR) */
- std::string _error;
+ /** summary of an error that has occurred (when state == FINISHED_ERROR) */
+ std::string _error_summary;
+ std::string _error_details;
/** time that this job was started */
time_t _start_time;
/** time that this job was started */
time_t _start_time;