Some include tidying.

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

diff --git a/src/lib/server.h b/src/lib/server.h
index abc5676d8a076685a39c3ea2957a3557cc66e63b..1dc3b7b4edf92d1c3545458c30ea1c8185c67f1c 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -25,13 +25,14 @@
  *  encoding work, and a class to implement such a server.
  */
 
-#include <string>
+#include "log.h"
+#include "exceptions.h"
+#include <libxml++/libxml++.h>
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/optional.hpp>
-#include <libxml++/libxml++.h>
-#include "log.h"
+#include <string>
 
 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,26 +86,35 @@ private:
        int _threads;
 };
 
-class Server : public boost::noncopyable
+class Server : public ExceptionStore, public boost::noncopyable
 {
 public:
        Server (boost::shared_ptr<Log> log, bool verbose);
+       ~Server ();
 
        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 ();
+       void start_accept ();
+       void handle_accept (boost::shared_ptr<Socket>, boost::system::error_code const &);
+
+       bool _terminate;
 
        std::vector<boost::thread *> _worker_threads;
        std::list<boost::shared_ptr<Socket> > _queue;
        boost::mutex _worker_mutex;
-       boost::condition _worker_condition;
+       boost::condition _full_condition;
+       boost::condition _empty_condition;
        boost::shared_ptr<Log> _log;
        bool _verbose;
 
+       boost::asio::io_service _io_service;
+       boost::asio::ip::tcp::acceptor _acceptor;
+
        struct Broadcast {
 
                Broadcast ()
@@ -122,6 +126,7 @@ private:
                boost::asio::ip::udp::socket* socket;
                char buffer[64];
                boost::asio::ip::udp::endpoint send_endpoint;
+               boost::asio::io_service io_service;
                
        } _broadcast;
 };