X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.h;h=f93d667467a0a4fe439651fe540d7dd3107e68fe;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=d0c061eb3755d01d0887ee2a2ac906da95412728;hpb=6fa353595ce8f784b7d5004a6c38c78bddae94c7;p=dcpomatic.git

diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h
index d0c061eb3..f93d66746 100644
--- a/src/lib/encode_server.h
+++ b/src/lib/encode_server.h
@@ -1,38 +1,45 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #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
@@ -41,34 +48,34 @@ class Log;
 class EncodeServer : public Server, public ExceptionStore
 {
 public:
-	EncodeServer (boost::shared_ptr<Log> log, bool verbose, int num_threads);
+	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;
-	boost::shared_ptr<Log> _log;
 	bool _verbose;
 	int _num_threads;
+	Waker _waker;
 
 	struct Broadcast {
 
 		Broadcast ()
-			: thread (0)
-			, socket (0)
+			: socket (0)
 		{}
 
-		boost::thread* thread;
+		boost::mutex mutex;
+		boost::thread thread;
 		boost::asio::ip::udp::socket* socket;
 		char buffer[64];
 		boost::asio::ip::udp::endpoint send_endpoint;
@@ -77,4 +84,5 @@ private:
 	} _broadcast;
 };
 
+
 #endif