#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)
: _terminate (false)
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
}
}
- shared_ptr<Socket> socket = make_shared<Socket> ();
+ shared_ptr<Socket> socket (new Socket);
_acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error));
}
handle (socket);
start_accept ();
}
+
+void
+Server::stop ()
+{
+ _io_service.stop ();
+}