Tidy up naming.

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 5c0ec6a6a828f5ce087dbe8ab21cca5c12b6ba68..d8af3462d681b477bbd7859c5c618395e4a133e7 100644 (file)
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -293,13 +293,12 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
 {
        asio::io_service io_service;
        asio::ip::tcp::resolver resolver (io_service);
-
        asio::ip::tcp::resolver::query query (serv->host_name(), boost::lexical_cast<string> (Config::instance()->server_port ()));
        asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
 
-       DeadlineWrapper wrapper;
+       Socket socket;
 
-       wrapper.connect (*endpoint_iterator, 30);
+       socket.connect (*endpoint_iterator, 30);
 
 #ifdef DEBUG_HASH
        _input->hash ("Input for remote encoding (before sending)");
@@ -322,19 +321,19 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
                s << _input->line_size()[i] << " ";
        }
 
-       wrapper.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30);
+       socket.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30);
 
        for (int i = 0; i < _input->components(); ++i) {
-               wrapper.write (_input->data()[i], _input->line_size()[i] * _input->lines(i), 30);
+               socket.write (_input->data()[i], _input->line_size()[i] * _input->lines(i), 30);
        }
 
        char buffer[32];
-       wrapper.read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
-       wrapper.consume (strlen (buffer) + 1);
+       socket.read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
+       socket.consume (strlen (buffer) + 1);
        shared_ptr<EncodedData> e (new RemotelyEncodedData (atoi (buffer)));
 
        /* now read the rest */
-       wrapper.read_definite_and_consume (e->data(), e->size(), 30);
+       socket.read_definite_and_consume (e->data(), e->size(), 30);
 
 #ifdef DEBUG_HASH
        e->hash ("Encoded image (after receiving)");
@@ -375,12 +374,12 @@ EncodedData::write (shared_ptr<const Options> opt, int frame)
  *  @param socket Socket
  */
 void
-EncodedData::send (shared_ptr<DeadlineWrapper> wrapper)
+EncodedData::send (shared_ptr<Socket> socket)
 {
        stringstream s;
        s << _size;
-       wrapper->write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30);
-       wrapper->write (_data, _size, 30);
+       socket->write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30);
+       socket->write (_data, _size, 30);
 }
 
 #ifdef DEBUG_HASH

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 752f0dda7d3d7cefcce3cf979abc2fa549a85560..da4e0c30168da272dbab043abc76655ed147fb86 100644 (file)
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -48,7 +48,7 @@ public:
 
        virtual ~EncodedData () {}
 
-       void send (boost::shared_ptr<DeadlineWrapper> wrapper);
+       void send (boost::shared_ptr<Socket> socket);
        void write (boost::shared_ptr<const Options>, int);
 
 #ifdef DEBUG_HASH

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 1f860d2548b936fd67778ffcfdd7cb24edd78688..8ca4260490aad273794390e76629dcc4de80ffef 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -70,11 +70,11 @@ Server::Server (Log* log)
 }
 
 int
-Server::process (shared_ptr<DeadlineWrapper> wrapper)
+Server::process (shared_ptr<Socket> socket)
 {
        char buffer[128];
-       wrapper->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
-       wrapper->consume (strlen (buffer) + 1);
+       socket->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
+       socket->consume (strlen (buffer) + 1);
        
        stringstream s (buffer);
        
@@ -121,7 +121,7 @@ Server::process (shared_ptr<DeadlineWrapper> wrapper)
        }
        
        for (int i = 0; i < image->components(); ++i) {
-               wrapper->read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30);
+               socket->read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30);
        }
        
 #ifdef DEBUG_HASH
@@ -130,7 +130,7 @@ Server::process (shared_ptr<DeadlineWrapper> wrapper)
        
        DCPVideoFrame dcp_video_frame (image, out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log);
        shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
-       encoded->send (wrapper);
+       encoded->send (socket);
 
 #ifdef DEBUG_HASH
        encoded->hash ("Encoded image (as made by server and as sent back)");
@@ -148,7 +148,7 @@ Server::worker_thread ()
                        _worker_condition.wait (lock);
                }
 
-               shared_ptr<DeadlineWrapper> wrapper = _queue.front ();
+               shared_ptr<Socket> socket = _queue.front ();
                _queue.pop_front ();
                
                lock.unlock ();
@@ -159,12 +159,12 @@ Server::worker_thread ()
                gettimeofday (&start, 0);
                
                try {
-                       frame = process (wrapper);
+                       frame = process (socket);
                } catch (std::exception& e) {
                        cerr << "Error: " << e.what() << "\n";
                }
                
-               wrapper.reset ();
+               socket.reset ();
                
                lock.lock ();
 
@@ -194,8 +194,8 @@ Server::run (int num_threads)
        asio::io_service io_service;
        asio::ip::tcp::acceptor acceptor (io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4(), Config::instance()->server_port ()));
        while (1) {
-               shared_ptr<DeadlineWrapper> wrapper (new DeadlineWrapper);
-               acceptor.accept (wrapper->socket ());
+               shared_ptr<Socket> socket (new Socket);
+               acceptor.accept (socket->socket ());
 
                mutex::scoped_lock lock (_worker_mutex);
                
@@ -204,7 +204,7 @@ Server::run (int num_threads)
                        _worker_condition.wait (lock);
                }
                
-               _queue.push_back (wrapper);
+               _queue.push_back (socket);
                _worker_condition.notify_all ();
        }
 }

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 8713c59221ca53231eb31fccd3304fd632d06a99..d12bd3e775a52a32187fa8ee5a4fc0d75d30c92a 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -438,7 +438,7 @@ colour_lut_index_to_name (int index)
        return "";
 }
 
-DeadlineWrapper::DeadlineWrapper ()
+Socket::Socket ()
        : _deadline (_io_service)
        , _socket (_io_service)
        , _buffer_data (0)
@@ -448,18 +448,18 @@ DeadlineWrapper::DeadlineWrapper ()
 }
 
 void
-DeadlineWrapper::check ()
+Socket::check ()
 {
        if (_deadline.expires_at() <= asio::deadline_timer::traits_type::now ()) {
                _socket.close ();
                _deadline.expires_at (posix_time::pos_infin);
        }
 
-       _deadline.async_wait (boost::bind (&DeadlineWrapper::check, this));
+       _deadline.async_wait (boost::bind (&Socket::check, this));
 }
 
 void
-DeadlineWrapper::connect (asio::ip::basic_resolver_entry<asio::ip::tcp> const & endpoint, int timeout)
+Socket::connect (asio::ip::basic_resolver_entry<asio::ip::tcp> const & endpoint, int timeout)
 {
        system::error_code ec = asio::error::would_block;
        _socket.async_connect (endpoint, lambda::var(ec) = lambda::_1);
@@ -473,7 +473,7 @@ DeadlineWrapper::connect (asio::ip::basic_resolver_entry<asio::ip::tcp> const &
 }
 
 void
-DeadlineWrapper::write (uint8_t const * data, int size, int timeout)
+Socket::write (uint8_t const * data, int size, int timeout)
 {
        _deadline.expires_from_now (posix_time::seconds (timeout));
        system::error_code ec = asio::error::would_block;
@@ -489,7 +489,7 @@ DeadlineWrapper::write (uint8_t const * data, int size, int timeout)
 }
 
 int
-DeadlineWrapper::read (uint8_t* data, int size, int timeout)
+Socket::read (uint8_t* data, int size, int timeout)
 {
        _deadline.expires_from_now (posix_time::seconds (timeout));
        system::error_code ec = asio::error::would_block;
@@ -517,7 +517,7 @@ DeadlineWrapper::read (uint8_t* data, int size, int timeout)
  *  @param size Amount of data to consume, in bytes.
  */
 void
-DeadlineWrapper::consume (int size)
+Socket::consume (int size)
 {
        assert (_buffer_data >= size);
        
@@ -534,7 +534,7 @@ DeadlineWrapper::consume (int size)
  *  @param size Number of bytes to read.
  */
 void
-DeadlineWrapper::read_definite_and_consume (uint8_t* data, int size, int timeout)
+Socket::read_definite_and_consume (uint8_t* data, int size, int timeout)
 {
        int const from_buffer = min (_buffer_data, size);
        if (from_buffer > 0) {
@@ -563,7 +563,7 @@ DeadlineWrapper::read_definite_and_consume (uint8_t* data, int size, int timeout
  *  @param size Maximum amount of data to read.
  */
 void
-DeadlineWrapper::read_indefinite (uint8_t* data, int size, int timeout)
+Socket::read_indefinite (uint8_t* data, int size, int timeout)
 {
        assert (size < int (sizeof (_buffer)));
 

diff --git a/src/lib/util.h b/src/lib/util.h
index 8d6e2f5415f5a202b6b30c2baa0065bfe964827c..d7f2330038cd653f0c8336fb1b11d9e209a67b9e 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -113,10 +113,10 @@ extern std::string crop_string (Position, Size);
 extern int dcp_audio_sample_rate (int);
 extern std::string colour_lut_index_to_name (int index);
 
-class DeadlineWrapper
+class Socket
 {
 public:
-       DeadlineWrapper ();
+       Socket ();
 
        boost::asio::ip::tcp::socket& socket () {
                return _socket;
@@ -124,7 +124,6 @@ public:
 
        void connect (boost::asio::ip::basic_resolver_entry<boost::asio::ip::tcp> const & endpoint, int timeout);
        void write (uint8_t const * data, int size, int timeout);
-       int read (uint8_t* data, int size, int timeout);
        
        void read_definite_and_consume (uint8_t* data, int size, int timeout);
        void read_indefinite (uint8_t* data, int size, int timeout);
@@ -132,8 +131,9 @@ public:
        
 private:
        void check ();
+       int read (uint8_t* data, int size, int timeout);
 
-       DeadlineWrapper (DeadlineWrapper const &);
+       Socket (Socket const &);
 
        boost::asio::io_service _io_service;
        boost::asio::deadline_timer _deadline;