Fix unlikely crash.

[dcpomatic.git] / src / lib / encode_server.cc

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 7e015200370afaff06b5f75b6606274665a359f5..cef2ad06f45250c1f597046d7ffb50851631ad8a 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -31,11 +31,10 @@
 #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 <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/algorithm/string.hpp>
@@ -65,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)
@@ -94,6 +94,10 @@ EncodeServer::~EncodeServer ()
                delete i;
        }
 
+       if (_broadcast.socket) {
+               _broadcast.socket->close ();
+       }
+       delete _broadcast.socket;
        _broadcast.io_service.stop ();
        if (_broadcast.thread) {
                /* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
@@ -102,6 +106,7 @@ EncodeServer::~EncodeServer ()
                if (_broadcast.thread->joinable ()) {
                        _broadcast.thread->join ();
                }
+               delete _broadcast.thread;
        }
 }
 
@@ -237,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 ());
@@ -274,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 (...) {