X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fserver.h;h=314102c1c2b7f5c78ba7cc29c814d46214ab89bc;hp=398401a555dd1eff784ad1d2289677e5258660f2;hb=dbf43f9113d88245f27493fd5d6950ba142b7f1f;hpb=afc495f722f89fea0bcc579046d1a5d362e36f69

diff --git a/src/lib/server.h b/src/lib/server.h
index 398401a55..314102c1c 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -17,83 +17,73 @@
 
 */
 
+#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.
+ *  @brief Server class.
  */
 
-#include <string>
+#include "exceptions.h"
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
-#include <libxml++/libxml++.h>
-#include "log.h"
+#include <string>
 
 class Socket;
+class Log;
 
 namespace cxml {
 	class Node;
 }
 
-/** @class ServerDescription
- *  @brief Class to describe a server to which we can send encoding work.
+/** @class Server
+ *  @brief A class to run a server which can accept requests to perform JPEG2000
+ *  encoding work.
  */
-class ServerDescription
-{
-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)
-	{}
-
-	ServerDescription (boost::shared_ptr<const cxml::Node>);
-	
-	/** @return server's host name or IP address in string form */
-	std::string host_name () const {
-		return _host_name;
-	}
-
-	/** @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;
-	}
-
-	void as_xml (xmlpp::Node *) const;
-	
-	static ServerDescription * create_from_metadata (std::string v);
-
-private:
-	/** server's host name */
-	std::string _host_name;
-	/** number of threads to use on the server */
-	int _threads;
-};
-
-class Server
+class Server : public ExceptionStore, public boost::noncopyable
 {
 public:
-	Server (boost::shared_ptr<Log> log);
+	Server (boost::shared_ptr<Log> log, bool verbose);
+	~Server ();
 
 	void run (int num_threads);
 
 private:
 	void worker_thread ();
-	int process (boost::shared_ptr<Socket> socket);
+	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::condition _full_condition;
+	boost::condition _empty_condition;
 	boost::shared_ptr<Log> _log;
+	bool _verbose;
+
+	boost::asio::io_service _io_service;
+	boost::asio::ip::tcp::acceptor _acceptor;
+
+	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;
 };
+
+#endif