Merge master.

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

diff --git a/src/lib/server.h b/src/lib/server.h
index 398401a555dd1eff784ad1d2289677e5258660f2..b340bba077953c7320c0fb9f1820e3ca2cf2a556 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_SERVER_H
+#define DCPOMATIC_SERVER_H
+
 /** @file src/server.h
  *  @brief Class to describe a server to which we can send
  *  encoding work, and a class to implement such a server.
@@ -26,8 +29,10 @@
 #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 "exceptions.h"
 
 class Socket;
 
@@ -41,6 +46,11 @@ namespace cxml {
 class ServerDescription
 {
 public:
+       ServerDescription ()
+               : _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.
         */
@@ -49,7 +59,7 @@ 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 {
@@ -69,10 +79,6 @@ public:
                _threads = t;
        }
 
-       void as_xml (xmlpp::Node *) const;
-       
-       static ServerDescription * create_from_metadata (std::string v);
-
 private:
        /** server's host name */
        std::string _host_name;
@@ -80,20 +86,51 @@ private:
        int _threads;
 };
 
-class Server
+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;
+
+       int _num_threads;
+
+       struct Broadcast {
+
+               Broadcast ()
+                       : 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;
 };
+
+#endif