{Video,Audio}Frame -> Frame.

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

diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index f964d4e1abf5df854c69bc908380929b05c1daed..dc62f998deb0d79f5e9926753fbd5c81c95f7559 100644 (file)
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,26 +17,37 @@
 
 */
 
-#include <boost/signals2.hpp>
 #include "server.h"
+#include "signaller.h"
+#include <boost/signals2.hpp>
 
-class ServerFinder
+class ServerFinder : public Signaller, public ExceptionStore
 {
 public:
-       void connect (boost::function<void (ServerDescription)>);
+       boost::signals2::connection connect (boost::function<void (ServerDescription)>);
 
        static ServerFinder* instance ();
+       static void drop ();
 
        void disable () {
                _disabled = true;
        }
 
+       bool disabled () const {
+               return _disabled;
+       }
+
 private:
        ServerFinder ();
+       ~ServerFinder ();
 
        void broadcast_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;
 
        bool _disabled;
@@ -47,7 +58,11 @@ private:
        boost::thread* _listen_thread;
 
        std::list<ServerDescription> _servers;
-       boost::mutex _mutex;
+       mutable boost::mutex _mutex;
+
+       boost::asio::io_service _listen_io_service;
+       boost::shared_ptr<boost::asio::ip::tcp::acceptor> _listen_acceptor;
+       bool _stop;
 
        static ServerFinder* _instance;
 };