diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-01-29 23:51:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-01-29 23:51:25 +0000 |
| commit | b3234e76d2f614c2b05034c0bdae8d5a4e9de9ea (patch) | |
| tree | ede230ed8036177b42162d3c20e7763c83c36ac5 /src/lib/job.h | |
| parent | 70b923d244255cc1425f0ade4b3d280e07da7038 (diff) | |
| parent | f5bc071ddac2355da1d116404cc37f4485e97699 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/lib/job.h')
| -rw-r--r-- | src/lib/job.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/job.h b/src/lib/job.h index 660ddaa13..311f9cc91 100644 --- a/src/lib/job.h +++ b/src/lib/job.h @@ -50,7 +50,8 @@ public: virtual void run () = 0; void start (); - void pause (); + void pause_by_user (); + void pause_by_priority (); void resume (); void cancel (); @@ -60,7 +61,8 @@ public: bool finished_ok () const; bool finished_in_error () const; bool finished_cancelled () const; - bool paused () const; + bool paused_by_user () const; + bool paused_by_priority () const; std::string error_summary () const; std::string error_details () const; @@ -94,7 +96,8 @@ protected: enum State { NEW, ///< the job hasn't been started yet RUNNING, ///< the job is running - PAUSED, ///< the job has been paused + PAUSED_BY_USER, ///< the job has been paused + PAUSED_BY_PRIORITY, ///< the job has been paused FINISHED_OK, ///< the job has finished successfully FINISHED_ERROR, ///< the job has finished in error FINISHED_CANCELLED ///< the job was cancelled |