Merge branch 'master' of /home/carl/git/dvdomatic

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

diff --git a/src/lib/server.h b/src/lib/server.h
index fac440a76134e3f90a308a2bea7fc8c7c458e7a3..32ba8dc4b96757fe0d3938317e2fe1c0c9abff2b 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -28,6 +28,8 @@
 #include <boost/thread/condition.hpp>
 #include "log.h"
 
+class Socket;
+
 /** @class ServerDescription
  *  @brief Class to describe a server to which we can send encoding work.
  */
@@ -80,10 +82,10 @@ public:
 
 private:
        void worker_thread ();
-       int process (boost::shared_ptr<boost::asio::ip::tcp::socket> socket);
-       
+       int process (boost::shared_ptr<Socket> socket);
+
        std::vector<boost::thread *> _worker_threads;
-       std::list<boost::shared_ptr<boost::asio::ip::tcp::socket> > _queue;
+       std::list<boost::shared_ptr<Socket> > _queue;
        boost::mutex _worker_mutex;
        boost::condition _worker_condition;
        Log* _log;