Merge branch '1.0' into 1.0-generated-control

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

diff --git a/src/lib/util.h b/src/lib/util.h
index 70cb3bb0c9ec820973996c7573d3e4353b1f1bfa..5e568cc27934cb84828cea9a0a25743520dea1b9 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -51,6 +51,8 @@ extern "C" {
 /** The maximum number of audio channels that we can cope with */
 #define MAX_AUDIO_CHANNELS 6
 
+#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
+
 namespace libdcp {
        class Signer;
 }
@@ -131,13 +133,15 @@ class Socket
 {
 public:
        Socket (int timeout = 30);
+       ~Socket ();
 
        /** @return Our underlying socket */
        boost::asio::ip::tcp::socket& socket () {
                return _socket;
        }
 
-       void connect (boost::asio::ip::basic_resolver_entry<boost::asio::ip::tcp> const & endpoint);
+       void connect (boost::asio::ip::tcp::endpoint);
+       void accept (int);
 
        void write (uint32_t n);
        void write (uint8_t const * data, int size);
@@ -153,6 +157,7 @@ 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;
 };