Merge master.

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

diff --git a/src/lib/server.h b/src/lib/server.h
index 9f3e99f9cbe577c20c7c07bedccbe0d7298f8c07..b340bba077953c7320c0fb9f1820e3ca2cf2a556 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -107,8 +107,8 @@ 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;