X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fserver.h;h=6ef2688310ba0ff46edb15c90d8cfdf5531abc90;hp=3e7c7945a34e69d246b1186ec963c5b67c157ce8;hb=HEAD;hpb=6fa353595ce8f784b7d5004a6c38c78bddae94c7

diff --git a/src/lib/server.h b/src/lib/server.h
index 3e7c7945a..0b1950aa7 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -1,52 +1,63 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 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.
 
-    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
-    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/>.
 
 */
 
+
 #ifndef DCPOMATIC_SERVER_H
 #define DCPOMATIC_SERVER_H
 
+
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
 #include <string>
 
+
 class Socket;
 
-class Server : public boost::noncopyable
+
+class Server
 {
 public:
-	Server (int port);
+	explicit Server (int port, int timeout = 30);
 	virtual ~Server ();
 
+	Server (Server const&) = delete;
+	Server& operator= (Server const&) = delete;
+
 	virtual void run ();
+	void stop ();
 
 protected:
 	boost::mutex _mutex;
 	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 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;
 };
 
+
 #endif