X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=5884df09aae9642ccea356b640a9d4491ef4fa3e;hp=9902c8e84c65bf8d792700f6b2ce5594ea216c4d;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=ad1ef39eda58b3a919ea3b7084401a0439409ec6

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 9902c8e84..5884df09a 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -88,27 +88,30 @@ EncodeServer::~EncodeServer ()
 	}
 
 	BOOST_FOREACH (boost::thread* i, _worker_threads) {
-		/* Ideally this would be a DCPOMATIC_ASSERT(i->joinable()) but we
-		   can't throw exceptions from a destructor.
-		*/
-		if (i->joinable ()) {
+		try {
 			i->join ();
+		} catch (...) {
+
 		}
 		delete i;
 	}
 
-	if (_broadcast.socket) {
-		_broadcast.socket->close ();
+	{
+		boost::mutex::scoped_lock lm (_broadcast.mutex);
+		if (_broadcast.socket) {
+			_broadcast.socket->close ();
+			delete _broadcast.socket;
+			_broadcast.socket = 0;
+		}
 	}
+
 	_broadcast.io_service.stop ();
-	if (_broadcast.thread) {
-		/* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
-		   can't throw exceptions from a destructor.
-		*/
-		if (_broadcast.thread->joinable ()) {
-			_broadcast.thread->join ();
+	if (_broadcast.thread.joinable()) {
+		try {
+			_broadcast.thread.join ();
+		} catch (...) {
+
 		}
-		delete _broadcast.thread;
 	}
 }
 
@@ -231,16 +234,16 @@ EncodeServer::run ()
 	}
 
 	for (int i = 0; i < _num_threads; ++i) {
-		thread* t = new thread (bind (&EncodeServer::worker_thread, this));
+		boost::thread* t = new thread(bind(&EncodeServer::worker_thread, this));
+		_worker_threads.push_back (t);
 #ifdef DCPOMATIC_LINUX
 		pthread_setname_np (t->native_handle(), "encode-server-worker");
 #endif
-		_worker_threads.push_back (t);
 	}
 
-	_broadcast.thread = new thread (bind (&EncodeServer::broadcast_thread, this));
+	_broadcast.thread = thread (bind(&EncodeServer::broadcast_thread, this));
 #ifdef DCPOMATIC_LINUX
-	pthread_setname_np (_broadcast.thread->native_handle(), "encode-server-broadcast");
+	pthread_setname_np (_broadcast.thread.native_handle(), "encode-server-broadcast");
 #endif
 
 	Server::run ();
@@ -306,10 +309,13 @@ EncodeServer::broadcast_received ()
 		}
 	}
 
-	_broadcast.socket->async_receive_from (
-		boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
-		_broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this)
-		);
+	boost::mutex::scoped_lock lm (_broadcast.mutex);
+	if (_broadcast.socket) {
+		_broadcast.socket->async_receive_from (
+			boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
+			_broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this)
+			);
+	}
 }
 
 void
@@ -317,6 +323,9 @@ EncodeServer::handle (shared_ptr<Socket> socket)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
+	Waker waker;
+	waker.nudge ();
+
 	/* Wait until the queue has gone down a bit */
 	while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {
 		_full_condition.wait (lock);