projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Writer on macOS runs as root, so trying to use the config_path()
[dcpomatic.git]
/
src
/
lib
/
server.h
diff --git
a/src/lib/server.h
b/src/lib/server.h
index 3e7c7945a34e69d246b1186ec963c5b67c157ce8..6ef2688310ba0ff46edb15c90d8cfdf5531abc90 100644
(file)
--- a/
src/lib/server.h
+++ b/
src/lib/server.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-23,6
+24,7
@@
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread/condition.hpp>
+#include <boost/noncopyable.hpp>
#include <string>
class Socket;
#include <string>
class Socket;
@@
-30,10
+32,11
@@
class Socket;
class Server : public boost::noncopyable
{
public:
class Server : public boost::noncopyable
{
public:
-
Server (int port
);
+
explicit Server (int port, int timeout = 30
);
virtual ~Server ();
virtual void run ();
virtual ~Server ();
virtual void run ();
+ void stop ();
protected:
boost::mutex _mutex;
protected:
boost::mutex _mutex;
@@
-47,6
+50,7
@@
private:
boost::asio::io_service _io_service;
boost::asio::ip::tcp::acceptor _acceptor;
boost::asio::io_service _io_service;
boost::asio::ip::tcp::acceptor _acceptor;
+ int _timeout;
};
#endif
};
#endif