Another macOS std::list boost::thread SNAFU.

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

diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h
index 00a1b6b12b0e65abcbf850007669d0767ea0e826..91e0075039823f2616e719061ff517d899ed1760 100644 (file)
--- a/src/lib/encode_server.h
+++ b/src/lib/encode_server.h
@@ -42,7 +42,7 @@ class Log;
 class EncodeServer : public Server, public ExceptionStore
 {
 public:
-       EncodeServer (boost::shared_ptr<Log> log, bool verbose, int num_threads);
+       EncodeServer (bool verbose, int num_threads);
        ~EncodeServer ();
 
        void run ();
@@ -54,22 +54,21 @@ private:
        void broadcast_thread ();
        void broadcast_received ();
 
-       std::vector<boost::thread *> _worker_threads;
+       std::vector<boost::thread*> _worker_threads;
        std::list<boost::shared_ptr<Socket> > _queue;
        boost::condition _full_condition;
        boost::condition _empty_condition;
-       boost::shared_ptr<Log> _log;
        bool _verbose;
        int _num_threads;
 
        struct Broadcast {
 
                Broadcast ()
-                       : thread (0)
-                       , socket (0)
+                       : socket (0)
                {}
 
-               boost::thread* thread;
+               boost::mutex mutex;
+               boost::thread thread;
                boost::asio::ip::udp::socket* socket;
                char buffer[64];
                boost::asio::ip::udp::endpoint send_endpoint;