X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fj2k_encoder.h;h=2180f3f6afd0625c20f436186febed35ec2e1c95;hp=4bdedb0604d17ae40cd2f1437c15a407c3e31500;hb=HEAD;hpb=607b1b4d8061237e3c90368c73c58a172a69c950

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index 4bdedb060..63228a6b8 100644
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -32,7 +32,7 @@
 #include "enum_indexed_vector.h"
 #include "event_history.h"
 #include "exception_store.h"
-#include "util.h"
+#include "writer.h"
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
@@ -47,7 +47,6 @@ class EncodeServerDescription;
 class Film;
 class Job;
 class PlayerVideo;
-class Writer;
 
 
 /** @class J2KEncoder
@@ -56,10 +55,10 @@ class Writer;
  *  This class keeps a queue of frames to be encoded and distributes
  *  the work around threads and encoding servers.
  */
-class J2KEncoder : public ExceptionStore, public std::enable_shared_from_this<J2KEncoder>
+class J2KEncoder : public ExceptionStore
 {
 public:
-	J2KEncoder (std::shared_ptr<const Film> film, std::shared_ptr<Writer> writer);
+	J2KEncoder(std::shared_ptr<const Film> film, Writer& writer);
 	~J2KEncoder ();
 
 	J2KEncoder (J2KEncoder const&) = delete;
@@ -81,8 +80,6 @@ public:
 
 private:
 
-	static void call_servers_list_changed (std::weak_ptr<J2KEncoder> encoder);
-
 	void frame_done ();
 
 	void encoder_thread (boost::optional<EncodeServerDescription>);
@@ -103,7 +100,7 @@ private:
 	/** condition to manage thread wakeups when we have too much to do */
 	boost::condition _full_condition;
 
-	std::shared_ptr<Writer> _writer;
+	Writer& _writer;
 	Waker _waker;
 
 	EnumIndexedVector<std::shared_ptr<PlayerVideo>, Eyes> _last_player_video;