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.cc
diff --git
a/src/lib/job.cc
b/src/lib/job.cc
index d3871bf7225da22ed1911416c1b2ee4df4cffd5d..68cdce3cd3a961ed1e3e272280d2ce3c62ac4fa6 100644
(file)
--- a/
src/lib/job.cc
+++ b/
src/lib/job.cc
@@
-31,12
+31,10
@@
using namespace std;
using namespace boost;
/** @param s FilmState for the film that we are operating on.
using namespace boost;
/** @param s FilmState for the film that we are operating on.
- * @param o Options.
* @param l A log that we can write to.
*/
* @param l A log that we can write to.
*/
-Job::Job (shared_ptr<const FilmState> s,
shared_ptr<const Options> o,
Log* l, shared_ptr<Job> req)
+Job::Job (shared_ptr<const FilmState> s, Log* l, shared_ptr<Job> req)
: _fs (s)
: _fs (s)
- , _opt (o)
, _log (l)
, _required (req)
, _state (NEW)
, _log (l)
, _required (req)
, _state (NEW)
@@
-163,6
+161,7
@@
void
Job::set_progress (float p)
{
boost::mutex::scoped_lock lm (_progress_mutex);
Job::set_progress (float p)
{
boost::mutex::scoped_lock lm (_progress_mutex);
+ _progress_unknown = false;
_stack.back().normalised = p;
}
_stack.back().normalised = p;
}
@@
-234,7
+233,7
@@
Job::set_error (string e)
_error = e;
}
_error = e;
}
-/** Say that this job's progress will
always be unknown
*/
+/** Say that this job's progress will
be unknown until further notice
*/
void
Job::set_progress_unknown ()
{
void
Job::set_progress_unknown ()
{