diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-04 00:24:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-02-04 00:24:55 +0100 |
| commit | 42cdfe79afa72a428b5ee851611079f84d237f63 (patch) | |
| tree | 5924126c4a849574a8be6b423051eda3120491ea /src/lib/server.cc | |
| parent | 81e16caf6414a011bbbe6e8c788f9dc1e4c0ce52 (diff) | |
Some noncopyable removal.
Diffstat (limited to 'src/lib/server.cc')
| -rw-r--r-- | src/lib/server.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/lib/server.cc b/src/lib/server.cc index acb8d08d8..c1be5735e 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,13 +18,18 @@ */ + #include "server.h" #include "dcpomatic_socket.h" + #include "i18n.h" + +using std::make_shared; using std::shared_ptr; + Server::Server (int port, int timeout) : _terminate (false) , _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port)) @@ -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> socket (new Socket(_timeout)); + auto socket = make_shared<Socket>(_timeout); _acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error)); } + void Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code const & error) { @@ -76,6 +85,7 @@ Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code cons start_accept (); } + void Server::stop () { |