X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=20f2951b64cbb63ab4d1020ed1a60cba99bb5b6d;hb=8031edf0ce27b75727438e504128448b0884b426;hp=3d0597cfad5b533508e1dc28f907f0ff4a093e90;hpb=2c5398adaea8bc56fe196144a9a233981657fba0;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 3d0597cfa..20f2951b6 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -37,7 +37,7 @@
 #include <stdint.h>
 
 class Film;
-class ServerDescription;
+class EncodeServerDescription;
 class DCPVideo;
 class Writer;
 class Job;
@@ -53,7 +53,7 @@ class PlayerVideo;
 class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-	Encoder (boost::shared_ptr<const Film>, boost::weak_ptr<Job>, boost::shared_ptr<Writer>);
+	Encoder (boost::shared_ptr<const Film>, boost::shared_ptr<Writer>);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
@@ -75,13 +75,12 @@ private:
 	void enqueue (boost::shared_ptr<PlayerVideo> f);
 	void frame_done ();
 
-	void encoder_thread (boost::optional<ServerDescription>);
+	void encoder_thread (boost::optional<EncodeServerDescription>);
 	void terminate_threads ();
 	void servers_list_changed ();
 
 	/** Film that we are encoding */
 	boost::shared_ptr<const Film> _film;
-	boost::weak_ptr<Job> _job;
 
 	/** Mutex for _time_history and _video_frames_enqueued */
 	mutable boost::mutex _state_mutex;