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 95599bdbb65bf1dd1ca8bae44b4347ac5bb1015d..c98dbaea15dfb13133611f61727439d332158470 100644
(file)
--- a/
src/lib/job.h
+++ b/
src/lib/job.h
@@
-26,19
+26,19
@@
#include <string>
#include <boost/thread/mutex.hpp>
#include <string>
#include <boost/thread/mutex.hpp>
-#include <sigc++/sigc++.h>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/signals2.hpp>
-class Log;
-class FilmState;
-class Options;
+class Film;
/** @class Job
* @brief A parent class to represent long-running tasks which are run in their own thread.
*/
/** @class Job
* @brief A parent class to represent long-running tasks which are run in their own thread.
*/
-class Job
+class Job
: public boost::enable_shared_from_this<Job>
{
public:
{
public:
- Job (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l);
+ Job (boost::shared_ptr<Film> s);
+ virtual ~Job() {}
/** @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;
@@
-47,12
+47,14
@@
public:
void start ();
void start ();
+ bool is_new () const;
bool running () const;
bool finished () const;
bool finished_ok () const;
bool finished_in_error () const;
bool running () const;
bool finished () 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;
@@
-63,15
+65,14
@@
public:
void descend (float);
float overall_progress () const;
void descend (float);
float overall_progress () const;
- void emit_finished ();
-
- /** Emitted from the GUI thread */
- sigc::signal0<void> Finished;
+ /** Emitted by the JobManagerView from the UI thread */
+ boost::signals2::signal<void()> Finished;
protected:
virtual int remaining_time () const;
protected:
virtual int remaining_time () const;
+ /** Description of a job's state */
enum State {
NEW, ///< the job hasn't been started yet
RUNNING, ///< the job is running
enum State {
NEW, ///< the job hasn't been started yet
RUNNING, ///< the job is running
@@
-80,13
+81,10
@@
protected:
};
void set_state (State);
};
void set_state (State);
- void set_error (std::string e);
-
- boost::shared_ptr<const FilmState> _fs;
- boost::shared_ptr<const Options> _opt;
+ void set_error (std::string s, std::string d);
- /**
A log that this job can write to
*/
-
Log* _log
;
+ /**
Film for this job
*/
+
boost::shared_ptr<Film> _film
;
private:
private:
@@
-94,11
+92,16
@@
private:
/** mutex for _state and _error */
mutable boost::mutex _state_mutex;
/** mutex for _state and _error */
mutable boost::mutex _state_mutex;
+ /** current state of the job */
State _state;
State _state;
- 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_t _start_time;
-
+
+ /** mutex for _stack and _progress_unknown */
mutable boost::mutex _progress_mutex;
struct Level {
mutable boost::mutex _progress_mutex;
struct Level {
@@
-112,6
+115,8
@@
private:
/** true if this job's progress will always be unknown */
bool _progress_unknown;
/** true if this job's progress will always be unknown */
bool _progress_unknown;
+
+ int _ran_for;
};
#endif
};
#endif