X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=c1be5735e9bb0be7db25831ebab9f44641ec1f3c;hb=58c63c02bc26209f42f42bccbe4a587f9df6f05f;hp=9a633c861064d776de263743058d7c6c481084e7;hpb=ebc29bddd5cbc5cad23cc9b1095d842f55ece5e0;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index 9a633c861..c1be5735e 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,12 +18,17 @@ */ + #include "server.h" #include "dcpomatic_socket.h" + #include "i18n.h" -using boost::shared_ptr; + +using std::make_shared; +using std::shared_ptr; + Server::Server (int port, int timeout) : _terminate (false) @@ -33,6 +38,7 @@ Server::Server (int port, int timeout) } + Server::~Server () { { @@ -44,6 +50,7 @@ Server::~Server () stop (); } + void Server::run () { @@ -51,6 +58,7 @@ Server::run () _io_service.run (); } + void Server::start_accept () { @@ -61,10 +69,11 @@ Server::start_accept () } } - shared_ptr socket (new Socket(_timeout)); + auto socket = make_shared(_timeout); _acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error)); } + void Server::handle_accept (shared_ptr socket, boost::system::error_code const & error) { @@ -76,6 +85,7 @@ Server::handle_accept (shared_ptr socket, boost::system::error_code cons start_accept (); } + void Server::stop () {