Merge master.

[dcpomatic.git] / src / lib / decoder.h

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index cc4c87373616e6f4f469e4f3ce9018b4ee5aa929..f2f5235168402c136e9c133ac8865c11396a99c7 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -36,7 +36,6 @@
 #include "film.h"
 #include "options.h"
 
-class Job;
 class Image;
 class Log;
 class DelayLine;
@@ -54,7 +53,7 @@ class FilterGraph;
 class Decoder
 {
 public:
-       Decoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
+       Decoder (boost::shared_ptr<Film>, DecodeOptions);
        virtual ~Decoder () {}
 
        virtual bool pass () = 0;
@@ -68,8 +67,6 @@ protected:
        boost::shared_ptr<Film> _film;
        /** our decode options */
        DecodeOptions _opt;
-       /** associated Job, or 0 */
-       Job* _job;
 
 private:
        virtual void film_changed (Film::Property) {}