Various bits of server tidying up.

1 files changed, 11 insertions, 5 deletions

diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index 8b56022de..04a7786cf 100644
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -23,19 +23,25 @@
 class ServerFinder
 {
 public:
-	ServerFinder ();
-	~ServerFinder ();
+	void connect (boost::function<void (ServerDescription)>);
 
-	boost::signals2::signal<void (ServerDescription)> ServerFound;
+	static ServerFinder* instance ();
 
 private:
+	ServerFinder ();
+
 	void broadcast_thread ();
 	void listen_thread ();
+
+	boost::signals2::signal<void (ServerDescription)> ServerFound;
 	
-	/** A thread to periodically issue broadcasts to find encoding servers */
+	/** Thread to periodically issue broadcasts to find encoding servers */
 	boost::thread* _broadcast_thread;
+	/** Thread to listen to the responses from servers */
 	boost::thread* _listen_thread;
 
-	bool _terminate;
+	std::list<ServerDescription> _servers;
 	boost::mutex _mutex;
+
+	static ServerFinder* _instance;
 };