X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=caadda591d20a606e97c0d9388c0a8abe533539f;hb=0ec7c9d0b1f3ea58ffe17dd70bea04ad702d164b;hp=6bbdda4c5e23ea8722395623efd950293d749d13;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6bbdda4c5..caadda591 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -20,28 +20,22 @@
 #ifndef DCPOMATIC_ENCODER_H
 #define DCPOMATIC_ENCODER_H
 
-/** @file src/encoder.h
+/** @file  src/encoder.h
  *  @brief Encoder class.
  */
 
 #include "util.h"
-#include "config.h"
 #include "cross.h"
-#include "exceptions.h"
-extern "C" {
-#include <libavutil/samplefmt.h>
-#include <libswresample/swresample.h>
-}
+#include "exception_store.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread.hpp>
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 #include <list>
 #include <stdint.h>
 
-class Image;
-class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideo;
@@ -82,14 +76,13 @@ private:
 
 	void encoder_thread (boost::optional<ServerDescription>);
 	void terminate_threads ();
-	void add_worker_threads (ServerDescription);
-	void server_found (ServerDescription);
+	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 _last_frame */
+	/** Mutex for _time_history and _video_frames_enqueued */
 	mutable boost::mutex _state_mutex;
 	/** List of the times of completion of the last _history_size frames;
 	    first is the most recently completed.
@@ -97,14 +90,18 @@ private:
 	std::list<struct timeval> _time_history;
 	/** Number of frames that we should keep history for */
 	static int const _history_size;
-
 	/** Number of video frames enqueued so far */
 	int _video_frames_enqueued;
+	bool _left_done;
+	bool _right_done;
 
+	/* XXX: probably should be atomic */
 	bool _terminate;
-	std::list<boost::shared_ptr<DCPVideo> > _queue;
+	/** Mutex for _threads */
+	mutable boost::mutex _threads_mutex;
 	std::list<boost::thread *> _threads;
-	mutable boost::mutex _mutex;
+	mutable boost::mutex _queue_mutex;
+	std::list<boost::shared_ptr<DCPVideo> > _queue;
 	/** condition to manage thread wakeups when we have nothing to do */
 	boost::condition _empty_condition;
 	/** condition to manage thread wakeups when we have too much to do */