std::shared_ptr

[dcpomatic.git] / src / lib / server.h

diff --git a/src/lib/server.h b/src/lib/server.h
index 3e7c7945a34e69d246b1186ec963c5b67c157ce8..fbcd7e870ff006204739ba26258c26d019dadeb5 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -1,19 +1,20 @@
 /*
     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.
 
-    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/>.
 
 */
 
@@ -23,6 +24,7 @@
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
+#include <boost/noncopyable.hpp>
 #include <string>
 
 class Socket;
@@ -30,23 +32,25 @@ class Socket;
 class Server : public boost::noncopyable
 {
 public:
-       Server (int port);
+       explicit Server (int port, int timeout = 30);
        virtual ~Server ();
 
        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