projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
job.cc
diff --git
a/src/lib/job.cc
b/src/lib/job.cc
index 812380594ec0ea247661951d93909773fbce2201..2e6385d62e8499a37ed427fb3650c1e22aec5196 100644
(file)
--- a/
src/lib/job.cc
+++ b/
src/lib/job.cc
@@
-26,6
+26,7
@@
#include <libdcp/exceptions.h>
#include "job.h"
#include "util.h"
#include <libdcp/exceptions.h>
#include "job.h"
#include "util.h"
+#include "cross.h"
#include "i18n.h"
#include "i18n.h"
@@
-153,6
+154,13
@@
Job::finished_cancelled () const
return _state == FINISHED_CANCELLED;
}
return _state == FINISHED_CANCELLED;
}
+bool
+Job::paused () const
+{
+ boost::mutex::scoped_lock lm (_state_mutex);
+ return _state == PAUSED;
+}
+
/** Set the state of this job.
* @param s New state.
*/
/** Set the state of this job.
* @param s New state.
*/
@@
-188,6
+196,10
@@
Job::set_progress (float p)
_progress_unknown = false;
_stack.back().normalised = p;
boost::this_thread::interruption_point ();
_progress_unknown = false;
_stack.back().normalised = p;
boost::this_thread::interruption_point ();
+
+ if (paused ()) {
+ dcpomatic_sleep (1);
+ }
}
/** @return fractional overall progress, or -1 if not known */
}
/** @return fractional overall progress, or -1 if not known */
@@
-324,3
+336,19
@@
Job::cancel ()
_thread->interrupt ();
_thread->join ();
}
_thread->interrupt ();
_thread->join ();
}
+
+void
+Job::pause ()
+{
+ if (running ()) {
+ set_state (PAUSED);
+ }
+}
+
+void
+Job::resume ()
+{
+ if (paused ()) {
+ set_state (RUNNING);
+ }
+}