X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.h;h=a9b4b1c1c8982ed9d57c615c9cee6fcfd9df0324;hb=a0c0e609f7fbff8513135428378cc16684bae937;hp=55d1075457aa4000e96b0e8d561107bbe27eebad;hpb=5698918140d640b3477634504a83da0d8d71a1cf;p=dcpomatic.git

diff --git a/src/lib/server.h b/src/lib/server.h
index 55d107545..a9b4b1c1c 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,16 +86,16 @@ private:
 	int _threads;
 };
 
-class Server : public boost::noncopyable
+class Server : public ExceptionStore, public boost::noncopyable
 {
 public:
-	Server (boost::shared_ptr<Log> log);
+	Server (boost::shared_ptr<Log> log, bool verbose);
 
 	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 ();
 
@@ -109,6 +104,7 @@ private:
 	boost::mutex _worker_mutex;
 	boost::condition _worker_condition;
 	boost::shared_ptr<Log> _log;
+	bool _verbose;
 
 	struct Broadcast {