X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.h;h=91e0075039823f2616e719061ff517d899ed1760;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hp=00a1b6b12b0e65abcbf850007669d0767ea0e826;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h index 00a1b6b12..91e007503 100644 --- 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, 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 _worker_threads; + std::vector _worker_threads; std::list > _queue; boost::condition _full_condition; boost::condition _empty_condition; - boost::shared_ptr _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;