diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 18:14:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 18:14:10 +0100 |
| commit | bd8fa9a370f1739952c83107352baa08c79d095e (patch) | |
| tree | dafa3dae2db5439dc08e770fc4b09febac5f0374 /src/lib/job.h | |
| parent | 44b57d623dec97a3f9955082f0b8a7a8d27b7518 (diff) | |
Merge FilmState / Film.
Diffstat (limited to 'src/lib/job.h')
| -rw-r--r-- | src/lib/job.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/job.h b/src/lib/job.h index 6b2b69b9d..b608f5da2 100644 --- a/src/lib/job.h +++ b/src/lib/job.h @@ -29,8 +29,7 @@ #include <boost/enable_shared_from_this.hpp> #include <sigc++/sigc++.h> -class Log; -class FilmState; +class Film; class Options; /** @class Job @@ -39,7 +38,7 @@ class Options; class Job : public boost::enable_shared_from_this<Job> { public: - Job (boost::shared_ptr<const FilmState> s, Log* l, boost::shared_ptr<Job> req); + Job (boost::shared_ptr<Film> s, boost::shared_ptr<Job> req); /** @return user-readable name of this job */ virtual std::string name () const = 0; @@ -89,10 +88,8 @@ protected: void set_state (State); void set_error (std::string e); - /** FilmState for this job */ - boost::shared_ptr<const FilmState> _fs; - /** a log that this job can write to */ - Log* _log; + /** Film for this job */ + boost::shared_ptr<Film> _film; private: |