X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=7bef82b2658c6b0b0e973b70b2e778593a7ed834;hb=0e28e29976f7b61ba8d76140a4a7ebc8fa8e80a4;hp=6560bcfec9ebf52b7dbeb5d0dc4d66ec25dcde05;hpb=6fa353595ce8f784b7d5004a6c38c78bddae94c7;p=dcpomatic.git

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 6560bcfec..7bef82b26 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 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/>.
 
 */
 
@@ -30,11 +31,11 @@
 #include "config.h"
 #include "cross.h"
 #include "player_video.h"
-#include "safe_stringstream.h"
-#include "raw_convert.h"
 #include "compose.hpp"
 #include "log.h"
 #include "encoded_log_entry.h"
+#include "version.h"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/algorithm/string.hpp>
@@ -64,9 +65,10 @@ using boost::scoped_array;
 using boost::optional;
 using dcp::Size;
 using dcp::Data;
+using dcp::raw_convert;
 
 EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
-	: Server (Config::instance()->server_port_base())
+	: Server (ENCODE_FRAME_PORT)
 	, _log (log)
 	, _verbose (verbose)
 	, _num_threads (num_threads)
@@ -78,20 +80,33 @@ EncodeServer::~EncodeServer ()
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
+		_terminate = true;
 		_empty_condition.notify_all ();
 		_full_condition.notify_all ();
 	}
 
 	BOOST_FOREACH (boost::thread* i, _worker_threads) {
-		DCPOMATIC_ASSERT (i->joinable ());
-		i->join ();
+		/* Ideally this would be a DCPOMATIC_ASSERT(i->joinable()) but we
+		   can't throw exceptions from a destructor.
+		*/
+		if (i->joinable ()) {
+			i->join ();
+		}
 		delete i;
 	}
 
+	if (_broadcast.socket) {
+		_broadcast.socket->close ();
+	}
 	_broadcast.io_service.stop ();
 	if (_broadcast.thread) {
-		DCPOMATIC_ASSERT (_broadcast.thread->joinable ());
-		_broadcast.thread->join ();
+		/* 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 ();
+		}
+		delete _broadcast.thread;
 	}
 }
 
@@ -208,7 +223,7 @@ EncodeServer::worker_thread ()
 void
 EncodeServer::run ()
 {
-	LOG_GENERAL ("Server starting with %1 threads", _num_threads);
+	LOG_GENERAL ("Server %1 (%2) starting with %3 threads", dcpomatic_version, dcpomatic_git_commit, _num_threads);
 	if (_verbose) {
 		cout << "DCP-o-matic server starting with " << _num_threads << " threads.\n";
 	}
@@ -227,7 +242,7 @@ EncodeServer::broadcast_thread ()
 try
 {
 	boost::asio::ip::address address = boost::asio::ip::address_v4::any ();
-	boost::asio::ip::udp::endpoint listen_endpoint (address, Config::instance()->server_port_base() + 1);
+	boost::asio::ip::udp::endpoint listen_endpoint (address, HELLO_PORT);
 
 	_broadcast.socket = new boost::asio::ip::udp::socket (_broadcast.io_service);
 	_broadcast.socket->open (listen_endpoint.protocol ());
@@ -264,7 +279,7 @@ EncodeServer::broadcast_received ()
 		}
 		shared_ptr<Socket> socket (new Socket);
 		try {
-			socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));
+			socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), SERVER_PRESENCE_PORT));
 			socket->write (xml.length() + 1);
 			socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
 		} catch (...) {