projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated es_ES translation from Manuel AC.
[dcpomatic.git]
/
src
/
lib
/
server.h
diff --git
a/src/lib/server.h
b/src/lib/server.h
index 59722274ee17b186d50a34f35df91182d7fbd411..0b1950aa7c550e461e2dcf0e1a49ae1964949c49 100644
(file)
--- a/
src/lib/server.h
+++ b/
src/lib/server.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,22
+18,29
@@
*/
*/
+
#ifndef DCPOMATIC_SERVER_H
#define DCPOMATIC_SERVER_H
#ifndef DCPOMATIC_SERVER_H
#define DCPOMATIC_SERVER_H
+
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread/condition.hpp>
#include <string>
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread/condition.hpp>
#include <string>
+
class Socket;
class Socket;
-class Server : public boost::noncopyable
+
+class Server
{
public:
explicit Server (int port, int timeout = 30);
virtual ~Server ();
{
public:
explicit Server (int port, int timeout = 30);
virtual ~Server ();
+ Server (Server const&) = delete;
+ Server& operator= (Server const&) = delete;
+
virtual void run ();
void stop ();
virtual void run ();
void stop ();
@@
-42,14
+49,15
@@
protected:
bool _terminate;
private:
bool _terminate;
private:
- virtual void handle (
boost
::shared_ptr<Socket> socket) = 0;
+ virtual void handle (
std
::shared_ptr<Socket> socket) = 0;
void start_accept ();
void start_accept ();
- void handle_accept (
boost
::shared_ptr<Socket>, boost::system::error_code const &);
+ void handle_accept (
std
::shared_ptr<Socket>, boost::system::error_code const &);
boost::asio::io_service _io_service;
boost::asio::ip::tcp::acceptor _acceptor;
int _timeout;
};
boost::asio::io_service _io_service;
boost::asio::ip::tcp::acceptor _acceptor;
int _timeout;
};
+
#endif
#endif