X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencode_server_finder.h;h=78b72fa9cc079e42706382bf58497ac193aa4724;hp=c639dfe3bf3aabdd641ee4295348699ca7cd2b0d;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=57d00c880094b1dfebaee18f4ecafb1dd44b0afb

diff --git a/src/lib/encode_server_finder.h b/src/lib/encode_server_finder.h
index c639dfe3b..78b72fa9c 100644
--- a/src/lib/encode_server_finder.h
+++ b/src/lib/encode_server_finder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,6 +31,15 @@
 
 class Socket;
 
+/** @class EncodeServerFinder
+ *  @brief Locater of encoding servers.
+ *
+ *  This class finds active (i.e. responding) encode servers.  Depending on
+ *  configuration it finds servers by:
+ *
+ *  1. broadcasting a request to the local subnet and
+ *  2. checking to see if any of the configured server hosts are up.
+ */
 class EncodeServerFinder : public Signaller, public ExceptionStore
 {
 public:
@@ -53,18 +62,20 @@ private:
 	void search_thread ();
 	void listen_thread ();
 
-	bool server_found (std::string) const;
+	boost::optional<std::list<EncodeServerDescription>::iterator> server_found (std::string);
 	void start_accept ();
 	void handle_accept (boost::system::error_code ec, boost::shared_ptr<Socket> socket);
 
 	void config_changed (Config::Property what);
 
 	/** Thread to periodically issue broadcasts and requests to find encoding servers */
-	boost::thread* _search_thread;
+	boost::thread _search_thread;
 	/** Thread to listen to the responses from servers */
-	boost::thread* _listen_thread;
+	boost::thread _listen_thread;
 
+	/** Available servers */
 	std::list<EncodeServerDescription> _servers;
+	/** Mutex for _servers */
 	mutable boost::mutex _servers_mutex;
 
 	boost::asio::io_service _listen_io_service;