diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-27 21:20:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-27 21:20:39 +0100 |
| commit | 4ed8008130d018a7adc8cc4adf059320bff05abb (patch) | |
| tree | 916a7d1b1b3deaae2b2d9ab3f817c16642fe52a5 /src/tools | |
| parent | 480a14fd2fd9937e2450c652f2953d5835f56239 (diff) | |
A few missed bits.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/servomatic.cc | 10 | ||||
| -rw-r--r-- | src/tools/wscript | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/tools/servomatic.cc b/src/tools/servomatic.cc index a802665c8..a9c45b3df 100644 --- 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 3be2d0eba..3dc742c35 100644 --- 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 = ['..'] |