No-op: remove all trailing whitespace.

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

diff --git a/src/lib/server.h b/src/lib/server.h
index 55d1075457aa4000e96b0e8d561107bbe27eebad..51dc8774e166372f6327d3753552bfac2f44601b 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;
 
@@ -49,7 +50,7 @@ public:
                : _host_name ("")
                , _threads (1)
        {}
-       
+
        /** @param h Server host name or IP address in string form.
         *  @param t Number of threads to use on the server.
         */
@@ -58,10 +59,8 @@ 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 */
        std::string host_name () const {
                return _host_name;
@@ -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,24 +86,34 @@ private:
        int _threads;
 };
 
-class Server : public boost::noncopyable
+class Server : public ExceptionStore, public boost::noncopyable
 {
 public:
-       Server (boost::shared_ptr<Log> log);
+       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 {
 
@@ -116,12 +121,13 @@ private:
                        : thread (0)
                        , socket (0)
                {}
-               
+
                boost::thread* thread;
                boost::asio::ip::udp::socket* socket;
                char buffer[64];
                boost::asio::ip::udp::endpoint send_endpoint;
-               
+               boost::asio::io_service io_service;
+
        } _broadcast;
 };