Logging improvements to allow prettier displays in the server GUI.

[dcpomatic.git] / src / lib / server_finder.h

diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index ec855938be4ddfd92e1f324194cbf6d8128b4e41..8aa07c0696145918cc64f5a8cc09fb35f98cbbb3 100644 (file)
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -17,15 +17,22 @@
 
 */
 
-#include "server.h"
+/** @file  src/lib/server_finder.h
+ *  @brief ServerFinder class.
+ */
+
 #include "signaller.h"
+#include "server_description.h"
+#include "config.h"
+#include "exception_store.h"
 #include <boost/signals2.hpp>
+#include <boost/thread/condition.hpp>
+
+class Socket;
 
 class ServerFinder : public Signaller, public ExceptionStore
 {
 public:
-       boost::signals2::connection connect (boost::function<void (ServerDescription)>);
-
        static ServerFinder* instance ();
        static void drop ();
 
@@ -37,32 +44,43 @@ public:
                return _disabled;
        }
 
+       std::list<ServerDescription> servers () const;
+
+       /** Emitted whenever the list of servers changes */
+       boost::signals2::signal<void ()> ServersListChanged;
+
 private:
        ServerFinder ();
        ~ServerFinder ();
 
-       void broadcast_thread ();
+       void start ();
+
+       void search_thread ();
        void listen_thread ();
 
        bool server_found (std::string) const;
        void start_accept ();
        void handle_accept (boost::system::error_code ec, boost::shared_ptr<Socket> socket);
 
-       boost::signals2::signal<void (ServerDescription)> ServerFound;
+       void config_changed (Config::Property what);
+       void search_now ();
 
        bool _disabled;
 
-       /** Thread to periodically issue broadcasts to find encoding servers */
-       boost::thread* _broadcast_thread;
+       /** Thread to periodically issue broadcasts and requests to find encoding servers */
+       boost::thread* _search_thread;
        /** Thread to listen to the responses from servers */
        boost::thread* _listen_thread;
 
        std::list<ServerDescription> _servers;
-       mutable boost::mutex _mutex;
+       mutable boost::mutex _servers_mutex;
 
        boost::asio::io_service _listen_io_service;
        boost::shared_ptr<boost::asio::ip::tcp::acceptor> _listen_acceptor;
        bool _stop;
 
+       boost::condition _search_condition;
+       boost::mutex _search_condition_mutex;
+
        static ServerFinder* _instance;
 };