X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.h;h=e2e1d46eca0f34f3748f708787b34437f1dc8402;hb=04eebe07e2f64bd15f6887a10ab51fb92c52901a;hp=68de3c2f04960d6d32713632432d33b906713dab;hpb=4782e1c0beec98560950a616902669f09a98faae;p=dcpomatic.git

diff --git a/src/lib/server.h b/src/lib/server.h
index 68de3c2f0..e2e1d46ec 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -32,6 +32,7 @@
 #include <boost/optional.hpp>
 #include <libxml++/libxml++.h>
 #include "log.h"
+#include "exceptions.h"
 
 class Socket;
 
@@ -58,8 +59,6 @@ public:
 		, _threads (t)
 	{}
 
-	ServerDescription (boost::shared_ptr<const cxml::Node>);
-
 	/* Default copy constructor is fine */
 	
 	/** @return server's host name or IP address in string form */
@@ -80,10 +79,6 @@ public:
 		_threads = t;
 	}
 
-	void as_xml (xmlpp::Node *) const;
-	
-	static boost::optional<ServerDescription> create_from_metadata (std::string);
-
 private:
 	/** server's host name */
 	std::string _host_name;
@@ -91,10 +86,11 @@ private:
 	int _threads;
 };
 
-class Server : public boost::noncopyable
+class Server : public ExceptionStore, public boost::noncopyable
 {
 public:
 	Server (boost::shared_ptr<Log> log, bool verbose);
+	~Server ();
 
 	void run (int num_threads);
 
@@ -103,14 +99,22 @@ private:
 	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 ()
@@ -122,6 +126,7 @@ private:
 		boost::asio::ip::udp::socket* socket;
 		char buffer[64];
 		boost::asio::ip::udp::endpoint send_endpoint;
+		boost::asio::io_service io_service;
 		
 	} _broadcast;
 };