Move luminance to Interop/SMPTE metadata and remove the ISDCF metadata dialogue.

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

diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h
index 14dc77398a660b730258974cc7b3fee8f9f2d74e..d313a851d3f942eb3bbe6a372b1a4075dece47a2 100644 (file)
--- a/src/lib/encode_server.h
+++ b/src/lib/encode_server.h
@@ -48,14 +48,14 @@ public:
        void run ();
 
 private:
-       void handle (boost::shared_ptr<Socket>);
+       void handle (std::shared_ptr<Socket>);
        void worker_thread ();
-       int process (boost::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
+       int process (std::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
        void broadcast_thread ();
        void broadcast_received ();
 
-       std::vector<boost::thread *> _worker_threads;
-       std::list<boost::shared_ptr<Socket> > _queue;
+       boost::thread_group _worker_threads;
+       std::list<std::shared_ptr<Socket> > _queue;
        boost::condition _full_condition;
        boost::condition _empty_condition;
        bool _verbose;
@@ -64,12 +64,11 @@ private:
        struct Broadcast {
 
                Broadcast ()
-                       : thread (0)
-                       , socket (0)
+                       : socket (0)
                {}
 
                boost::mutex mutex;
-               boost::thread* thread;
+               boost::thread thread;
                boost::asio::ip::udp::socket* socket;
                char buffer[64];
                boost::asio::ip::udp::endpoint send_endpoint;