Add disk writer tool.

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

diff --git a/src/lib/server.cc b/src/lib/server.cc
index d90ec9116dcf9ed5e1fa5d75e12063c3a9c4072a..9a633c861064d776de263743058d7c6c481084e7 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -20,25 +20,28 @@
 
 #include "server.h"
 #include "dcpomatic_socket.h"
-#include <boost/make_shared.hpp>
 
 #include "i18n.h"
 
 using boost::shared_ptr;
-using boost::make_shared;
 
-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)
 {
 
 }
 
 Server::~Server ()
 {
-       boost::mutex::scoped_lock lm (_mutex);
-       _terminate = true;
-       _io_service.stop ();
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _terminate = true;
+       }
+
+       _acceptor.close ();
+       stop ();
 }
 
 void
@@ -58,7 +61,7 @@ Server::start_accept ()
                }
        }
 
-       shared_ptr<Socket> socket = make_shared<Socket> ();
+       shared_ptr<Socket> socket (new Socket(_timeout));
        _acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error));
 }
 
@@ -72,3 +75,9 @@ Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code cons
        handle (socket);
        start_accept ();
 }
+
+void
+Server::stop ()
+{
+       _io_service.stop ();
+}