X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.h;h=f93d667467a0a4fe439651fe540d7dd3107e68fe;hb=f706bbb9afd10472e81a051cd5db601d6404377c;hp=14dc77398a660b730258974cc7b3fee8f9f2d74e;hpb=b042118121a27027b94d380ea4788e03ed1a9944;p=dcpomatic.git

diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h
index 14dc77398..f93d66746 100644
--- a/src/lib/encode_server.h
+++ b/src/lib/encode_server.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,22 +18,28 @@
 
 */
 
+
 #ifndef DCPOMATIC_ENCODE_SERVER_H
 #define DCPOMATIC_ENCODE_SERVER_H
 
+
 /** @file src/encode_server.h
  *  @brief EncodeServer class.
  */
 
-#include "server.h"
+
+#include "cross.h"
 #include "exception_store.h"
-#include <boost/thread.hpp>
+#include "server.h"
 #include <boost/asio.hpp>
+#include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <string>
 
-class Socket;
+
 class Log;
+class Socket;
+
 
 /** @class EncodeServer
  *  @brief A class to run a server which can accept requests to perform JPEG2000
@@ -45,31 +51,31 @@ public:
 	EncodeServer (bool verbose, int num_threads);
 	~EncodeServer ();
 
-	void run ();
+	void run () override;
 
 private:
-	void handle (boost::shared_ptr<Socket>);
+	void handle (std::shared_ptr<Socket>) override;
 	void worker_thread ();
-	int process (boost::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
+	int process (std::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
 	void broadcast_thread ();
 	void broadcast_received ();
 
-	std::vector<boost::thread *> _worker_threads;
-	std::list<boost::shared_ptr<Socket> > _queue;
+	boost::thread_group _worker_threads;
+	std::list<std::shared_ptr<Socket>> _queue;
 	boost::condition _full_condition;
 	boost::condition _empty_condition;
 	bool _verbose;
 	int _num_threads;
+	Waker _waker;
 
 	struct Broadcast {
 
 		Broadcast ()
-			: thread (0)
-			, socket (0)
+			: socket (0)
 		{}
 
 		boost::mutex mutex;
-		boost::thread* thread;
+		boost::thread thread;
 		boost::asio::ip::udp::socket* socket;
 		char buffer[64];
 		boost::asio::ip::udp::endpoint send_endpoint;
@@ -78,4 +84,5 @@ private:
 	} _broadcast;
 };
 
+
 #endif