Tidy up slightly.

[dcpomatic.git] / src / lib / dcp_video.cc

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index e3ba7d20fdfb3dbec68cb4a165e00b44c6aa7522..ba8057be06a97fa0f0ff751ca25e0b2a20f76884 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -43,7 +43,6 @@
 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k.h>
-#include <dcp/colour_matrix.h>
 #include <libxml++/libxml++.h>
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
@@ -149,6 +148,7 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
 
 /** Send this frame to a remote server for J2K encoding, then read the result.
  *  @param serv Server to send to.
+ *  @param timeout timeout in seconds.
  *  @return Encoded data.
  */
 Data
@@ -177,17 +177,17 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
        socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
 
        /* Send binary data */
-       LOG_TIMING("start-remote-send thread=%1", boost::this_thread::get_id());
+       LOG_TIMING("start-remote-send thread=%1", thread_id ());
        _frame->send_binary (socket);
 
        /* Read the response (JPEG2000-encoded data); this blocks until the data
           is ready and sent back.
        */
-       LOG_TIMING("start-remote-encode thread=%1", boost::this_thread::get_id ());
+       LOG_TIMING("start-remote-encode thread=%1", thread_id ());
        Data e (socket->read_uint32 ());
-       LOG_TIMING("start-remote-receive thread=%1", boost::this_thread::get_id ());
+       LOG_TIMING("start-remote-receive thread=%1", thread_id ());
        socket->read (e.data().get(), e.size());
-       LOG_TIMING("finish-remote-receive thread=%1", boost::this_thread::get_id ());
+       LOG_TIMING("finish-remote-receive thread=%1", thread_id ());
 
        LOG_DEBUG_ENCODE (N_("Finished remotely-encoded frame %1"), _index);