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

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index cea965309..4bdedb060 100644
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -28,25 +28,26 @@
  */
 
 
-#include "util.h"
 #include "cross.h"
+#include "enum_indexed_vector.h"
 #include "event_history.h"
 #include "exception_store.h"
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
-#include <boost/thread.hpp>
+#include "util.h"
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
+#include <boost/thread/mutex.hpp>
 #include <list>
 #include <stdint.h>
 
 
-class Film;
-class EncodeServerDescription;
 class DCPVideo;
-class Writer;
+class EncodeServerDescription;
+class Film;
 class Job;
 class PlayerVideo;
+class Writer;
 
 
 /** @class J2KEncoder
@@ -96,7 +97,7 @@ private:
 	std::shared_ptr<boost::thread_group> _threads;
 
 	mutable boost::mutex _queue_mutex;
-	std::list<std::shared_ptr<DCPVideo>> _queue;
+	std::list<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 */
@@ -105,7 +106,7 @@ private:
 	std::shared_ptr<Writer> _writer;
 	Waker _waker;
 
-	std::shared_ptr<PlayerVideo> _last_player_video[static_cast<int>(Eyes::COUNT)];
+	EnumIndexedVector<std::shared_ptr<PlayerVideo>, Eyes> _last_player_video;
 	boost::optional<dcpomatic::DCPTime> _last_player_video_time;
 
 	boost::signals2::scoped_connection _server_found_connection;