Merge branch 'master' into 2.0

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

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index b1183b0bb5448ebbcc41921dde4fcf0e0b90ed0e..25b2ef90841c68a23dd077eb12d41d0c4a282969 100644 (file)
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -21,7 +21,6 @@
 #include "encoder.h"
 
 class Film;
-class Job;
 class Encoder;
 class VideoFilter;
 class Player;
@@ -30,10 +29,7 @@ class Player;
 class Transcoder : public boost::noncopyable
 {
 public:
-       Transcoder (
-               boost::shared_ptr<const Film> f,
-               boost::shared_ptr<Job> j
-               );
+       Transcoder (boost::shared_ptr<const Film>, boost::shared_ptr<Job>);
 
        void go ();
 
@@ -46,8 +42,7 @@ public:
        }
 
 private:
-       /** A Job that is running this Transcoder, or 0 */
-       boost::shared_ptr<Job> _job;
+       boost::shared_ptr<const Film> _film;
        boost::shared_ptr<Player> _player;
        boost::shared_ptr<Encoder> _encoder;
        bool _finishing;