Merge master.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 678cdf04eae219bbcd8218765ff0d11facab3725..6bb97012abaebfceedf57f30960aaa3fb3bfbf30 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -110,7 +110,10 @@ private:
        std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
        std::list<boost::thread *> _threads;
        mutable boost::mutex _mutex;
-       boost::condition _condition;
+       /** condition to manage thread wakeups when we have nothing to do */
+       boost::condition _empty_condition;
+       /** condition to manage thread wakeups when we have too much to do */
+       boost::condition _full_condition;
 
        boost::shared_ptr<Writer> _writer;
        Waker _waker;