A few missed bits.

diff --git a/src/tools/servomatic.cc b/src/tools/servomatic.cc
index a802665c818fd6d2a545b7d7f312617a74ecf47e..a9c45b3dfe1638443dded09c948bfb1d7e26d394 100644 (file)
--- a/src/tools/servomatic.cc
+++ b/src/tools/servomatic.cc
@@ -114,7 +114,7 @@ process (shared_ptr<asio::ip::tcp::socket> socket)
        
        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 (fd);
+       encoded->send (socket);
 
 #ifdef DEBUG_HASH
        encoded->hash ("Encoded image (as made by server and as sent back)");
@@ -185,18 +185,10 @@ main ()
                while (int (queue.size()) >= num_threads * 2) {
                        worker_condition.wait (lock);
                }
-
-               struct timeval tv;
-               tv.tv_sec = 20;
-               tv.tv_usec = 0;
-               setsockopt (new_fd, SOL_SOCKET, SO_RCVTIMEO, (void *) &tv, sizeof (tv));
-               setsockopt (new_fd, SOL_SOCKET, SO_SNDTIMEO, (void *) &tv, sizeof (tv));
                
                queue.push_back (socket);
                worker_condition.notify_all ();
        }
        
-       close (fd);
-
        return 0;
 }

diff --git a/src/tools/wscript b/src/tools/wscript
index 3be2d0eba7a0ef413bfc6464f6141eb65fbe46ca..3dc742c35912f62fbe4051e710054b98dc065fc6 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -1,5 +1,5 @@
 def build(bld):
-    for t in ['makedcp', 'fixlengths']:
+    for t in ['makedcp', 'fixlengths', 'servomatic']:
         obj = bld(features = 'cxx cxxprogram')
        obj.uselib = 'BOOST_THREAD'
        obj.includes = ['..']