X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fserver.h;h=6ef2688310ba0ff46edb15c90d8cfdf5531abc90;hp=32ba8dc4b96757fe0d3938317e2fe1c0c9abff2b;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=1e53d56c1488cce07bc8aad7bcc76edd36c19961

diff --git a/src/lib/server.h b/src/lib/server.h
index 32ba8dc4b..6ef268831 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -1,92 +1,56 @@
 /*
-    Copyright (C) 2012 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.
 
-    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/>.
 
 */
 
-/** @file src/server.h
- *  @brief Class to describe a server to which we can send
- *  encoding work, and a class to implement such a server.
- */
+#ifndef DCPOMATIC_SERVER_H
+#define DCPOMATIC_SERVER_H
 
-#include <string>
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
-#include "log.h"
+#include <boost/noncopyable.hpp>
+#include <string>
 
 class Socket;
 
-/** @class ServerDescription
- *  @brief Class to describe a server to which we can send encoding work.
- */
-class ServerDescription
+class Server : public boost::noncopyable
 {
 public:
-	/** @param h Server host name or IP address in string form.
-	 *  @param t Number of threads to use on the server.
-	 */
-	ServerDescription (std::string h, int t)
-		: _host_name (h)
-		, _threads (t)
-	{}
-
-	/** @return server's host name or IP address in string form */
-	std::string host_name () const {
-		return _host_name;
-	}
+	explicit Server (int port, int timeout = 30);
+	virtual ~Server ();
 
-	/** @return number of threads to use on the server */
-	int threads () const {
-		return _threads;
-	}
+	virtual void run ();
+	void stop ();
 
-	void set_host_name (std::string n) {
-		_host_name = n;
-	}
-
-	void set_threads (int t) {
-		_threads = t;
-	}
-
-	std::string as_metadata () const;
-	
-	static ServerDescription * create_from_metadata (std::string v);
+protected:
+	boost::mutex _mutex;
+	bool _terminate;
 
 private:
-	/** server's host name */
-	std::string _host_name;
-	/** number of threads to use on the server */
-	int _threads;
-};
+	virtual void handle (boost::shared_ptr<Socket> socket) = 0;
 
-class Server
-{
-public:
-	Server (Log* log);
-
-	void run (int num_threads);
+	void start_accept ();
+	void handle_accept (boost::shared_ptr<Socket>, boost::system::error_code const &);
 
-private:
-	void worker_thread ();
-	int process (boost::shared_ptr<Socket> socket);
-
-	std::vector<boost::thread *> _worker_threads;
-	std::list<boost::shared_ptr<Socket> > _queue;
-	boost::mutex _worker_mutex;
-	boost::condition _worker_condition;
-	Log* _log;
+	boost::asio::io_service _io_service;
+	boost::asio::ip::tcp::acceptor _acceptor;
+	int _timeout;
 };
+
+#endif