X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=4f27ee42132ac244c45f22020a4bba6db6902d82;hb=320c20b9538c985005dc850d685eecfc1a5edc98;hp=abd8537c01786475c927ad1a09ac1ba9cb40a063;hpb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;p=dcpomatic.git

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index abd8537c0..4f27ee421 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -31,10 +31,10 @@
 #include "config.h"
 #include "cross.h"
 #include "player_video.h"
-#include "raw_convert.h"
 #include "compose.hpp"
 #include "log.h"
 #include "encoded_log_entry.h"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/algorithm/string.hpp>
@@ -64,9 +64,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)
@@ -236,7 +237,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 ());
@@ -273,7 +274,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 (...) {