summaryrefslogtreecommitdiff
path: root/src/lib/job.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-24 18:14:10 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-24 18:14:10 +0100
commitbd8fa9a370f1739952c83107352baa08c79d095e (patch)
treedafa3dae2db5439dc08e770fc4b09febac5f0374 /src/lib/job.cc
parent44b57d623dec97a3f9955082f0b8a7a8d27b7518 (diff)
Merge FilmState / Film.
Diffstat (limited to 'src/lib/job.cc')
-rw-r--r--src/lib/job.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 68cdce3cd..f3d7deac0 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -30,20 +30,16 @@
using namespace std;
using namespace boost;
-/** @param s FilmState for the film that we are operating on.
- * @param l A log that we can write to.
+/** @param s Film that we are operating on.
*/
-Job::Job (shared_ptr<const FilmState> s, Log* l, shared_ptr<Job> req)
- : _fs (s)
- , _log (l)
+Job::Job (shared_ptr<Film> f, shared_ptr<Job> req)
+ : _film (f)
, _required (req)
, _state (NEW)
, _start_time (0)
, _progress_unknown (false)
, _ran_for (0)
{
- assert (_log);
-
descend (1);
}