Use the correct font to render subtitles in preview / burn-in (#663).

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

diff --git a/src/lib/server.h b/src/lib/server.h
index 9f3e99f9cbe577c20c7c07bedccbe0d7298f8c07..51dc8774e166372f6327d3753552bfac2f44601b 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -25,14 +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 "exceptions.h"
+#include <string>
 
 class Socket;
 
@@ -50,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.
         */
@@ -60,7 +60,7 @@ public:
        {}
 
        /* Default copy constructor is fine */
-       
+
        /** @return server's host name or IP address in string form */
        std::string host_name () const {
                return _host_name;
@@ -107,29 +107,27 @@ private:
        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;
 };