11b5bf6229b8713dffde89a777cd5181335136f6 from master; default colour conversions...

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

diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h
index d2ee6d5555c634a8c58a31e47e81abbda0e746ec..82ca5ff694bac96d0605553e36ecf89d9c3597ba 100644 (file)
--- a/src/lib/dcpomatic_socket.h
+++ b/src/lib/dcpomatic_socket.h
@@ -23,14 +23,13 @@
  *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
  *  that are useful for DCP-o-matic.
  *
- *  This class wraps some things that I could not work out how to do with boost;
+ *  This class wraps some things that I could not work out how to do easily with boost;
  *  most notably, sync read/write calls with timeouts.
  */
-class Socket
+class Socket : public boost::noncopyable
 {
 public:
        Socket (int timeout = 30);
-       ~Socket ();
 
        /** @return Our underlying socket */
        boost::asio::ip::tcp::socket& socket () {
@@ -38,7 +37,6 @@ public:
        }
 
        void connect (boost::asio::ip::tcp::endpoint);
-       void accept (int);
 
        void write (uint32_t n);
        void write (uint8_t const * data, int size);
@@ -54,6 +52,5 @@ private:
        boost::asio::io_service _io_service;
        boost::asio::deadline_timer _deadline;
        boost::asio::ip::tcp::socket _socket;
-       boost::asio::ip::tcp::acceptor* _acceptor;
        int _timeout;
 };