Use enum class for VideoRange.

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

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 722b1c81130bde8a81856526c3ad01c357153f3e..acb8d08d8e800cbbf429ac1ff924d2ef6c8f75ca 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -23,11 +23,12 @@
 
 #include "i18n.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
-Server::Server (int port)
+Server::Server (int port, int timeout)
        : _terminate (false)
        , _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port))
+       , _timeout (timeout)
 {
 
 }
@@ -60,7 +61,7 @@ Server::start_accept ()
                }
        }
 
-       shared_ptr<Socket> socket (new Socket);
+       shared_ptr<Socket> socket (new Socket(_timeout));
        _acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error));
 }