Move ExportFormat definition to ffmpeg_file_encoder.h

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

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 6faab0e63b829e9b65bef2672f6934295504323e..200286fd94426e945c32cff7c37b8dc0867a47bd 100644 (file)
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -203,16 +203,17 @@ catch (...)
 void
 EncodeServerFinder::start_accept ()
 {
-       auto socket = make_shared<Socket>();
+       _accept_socket = make_shared<Socket>();
+
        _listen_acceptor->async_accept (
-               socket->socket(),
-               boost::bind(&EncodeServerFinder::handle_accept, this, boost::asio::placeholders::error, socket)
+               _accept_socket->socket(),
+               boost::bind(&EncodeServerFinder::handle_accept, this, boost::asio::placeholders::error)
                );
 }
 
 
 void
-EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> socket)
+EncodeServerFinder::handle_accept (boost::system::error_code ec)
 {
        if (ec) {
                start_accept ();
@@ -220,47 +221,39 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Sock
        }
 
        uint32_t length;
-       socket->read (reinterpret_cast<uint8_t*>(&length), sizeof(uint32_t));
+       _accept_socket->read (reinterpret_cast<uint8_t*>(&length), sizeof(uint32_t));
        length = ntohl (length);
 
        scoped_array<char> buffer(new char[length]);
-       socket->read (reinterpret_cast<uint8_t*>(buffer.get()), length);
+       _accept_socket->read (reinterpret_cast<uint8_t*>(buffer.get()), length);
 
        string s (buffer.get());
        auto xml = make_shared<cxml::Document>("ServerAvailable");
        xml->read_string (s);
 
-       auto const ip = socket->socket().remote_endpoint().address().to_string();
-       auto found = server_found (ip);
-       if (found) {
-               (*found)->set_seen ();
-       } else {
-               EncodeServerDescription sd (ip, xml->number_child<int>("Threads"), xml->optional_number_child<int>("Version").get_value_or(0));
-               {
-                       boost::mutex::scoped_lock lm (_servers_mutex);
-                       _servers.push_back (sd);
+       auto const ip = _accept_socket->socket().remote_endpoint().address().to_string();
+       bool changed = false;
+       {
+               boost::mutex::scoped_lock lm (_servers_mutex);
+               auto i = _servers.begin();
+               while (i != _servers.end() && i->host_name() != ip) {
+                       ++i;
                }
-               emit (boost::bind(boost::ref (ServersListChanged)));
-       }
-
-       start_accept ();
-}
-
 
-optional<list<EncodeServerDescription>::iterator>
-EncodeServerFinder::server_found (string ip)
-{
-       boost::mutex::scoped_lock lm (_servers_mutex);
-       auto i = _servers.begin();
-       while (i != _servers.end() && i->host_name() != ip) {
-               ++i;
+               if (i != _servers.end()) {
+                       i->set_seen();
+               } else {
+                       EncodeServerDescription sd (ip, xml->number_child<int>("Threads"), xml->optional_number_child<int>("Version").get_value_or(0));
+                       _servers.push_back (sd);
+                       changed = true;
+               }
        }
 
-       if (i != _servers.end()) {
-               return i;
+       if (changed) {
+               emit (boost::bind(boost::ref (ServersListChanged)));
        }
 
-       return {};
+       start_accept ();
 }