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

diff --git a/src/lib/server.h b/src/lib/server.h
index 9f3e99f9c..6ef268831 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -1,136 +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/>.
 
 */
 
 #ifndef DCPOMATIC_SERVER_H
 #define DCPOMATIC_SERVER_H
 
-/** @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.
- */
-
-#include <string>
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
-#include <boost/optional.hpp>
-#include <libxml++/libxml++.h>
-#include "log.h"
-#include "exceptions.h"
+#include <boost/noncopyable.hpp>
+#include <string>
 
 class Socket;
 
-namespace cxml {
-	class Node;
-}
-
-/** @class ServerDescription
- *  @brief Class to describe a server to which we can send encoding work.
- */
-class ServerDescription
+class Server : public boost::noncopyable
 {
 public:
-	ServerDescription ()
-		: _host_name ("")
-		, _threads (1)
-	{}
-	
-	/** @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)
-	{}
+	explicit Server (int port, int timeout = 30);
+	virtual ~Server ();
 
-	/* Default copy constructor is fine */
-	
-	/** @return server's host name or IP address in string form */
-	std::string host_name () const {
-		return _host_name;
-	}
+	virtual void run ();
+	void stop ();
 
-	/** @return number of threads to use on the server */
-	int threads () const {
-		return _threads;
-	}
-
-	void set_host_name (std::string n) {
-		_host_name = n;
-	}
-
-	void set_threads (int t) {
-		_threads = t;
-	}
+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;
-};
-
-class Server : public ExceptionStore, public boost::noncopyable
-{
-public:
-	Server (boost::shared_ptr<Log> log, bool verbose);
-	~Server ();
-
-	void run (int num_threads);
+	virtual void handle (boost::shared_ptr<Socket> socket) = 0;
 
-private:
-	void worker_thread ();
-	int process (boost::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
-	void broadcast_thread ();
-	void broadcast_received ();
 	void start_accept ();
 	void handle_accept (boost::shared_ptr<Socket>, boost::system::error_code const &);
 
-	bool _terminate;
-
-	std::vector<boost::thread *> _worker_threads;
-	std::list<boost::shared_ptr<Socket> > _queue;
-	boost::mutex _worker_mutex;
-	boost::condition _worker_condition;
-	
-	boost::shared_ptr<Log> _log;
-	bool _verbose;
-
 	boost::asio::io_service _io_service;
 	boost::asio::ip::tcp::acceptor _acceptor;
-
-	int _num_threads;
-
-	struct Broadcast {
-
-		Broadcast ()
-			: thread (0)
-			, socket (0)
-		{}
-		
-		boost::thread* thread;
-		boost::asio::ip::udp::socket* socket;
-		char buffer[64];
-		boost::asio::ip::udp::endpoint send_endpoint;
-		boost::asio::io_service io_service;
-		
-	} _broadcast;
+	int _timeout;
 };
 
 #endif