diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-09-23 15:07:30 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-09-23 15:07:30 +0100 |
| commit | 46f1b3106ab959e21946fe1f035efc6dc1743b49 (patch) | |
| tree | 416e510fd6aa5343d1a77c9c74f0562c44519871 /src/lib | |
| parent | f62909cfe63e6a2e238e655ea0536a5f627e0ddf (diff) | |
Missing use of wrapper.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp_video_frame.cc | 6 | ||||
| -rw-r--r-- | src/lib/dcp_video_frame.h | 2 | ||||
| -rw-r--r-- | src/lib/server.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index d202109d0..ee29d8601 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -378,12 +378,12 @@ EncodedData::write (shared_ptr<const Options> opt, int frame) * @param socket Socket */ void -EncodedData::send (shared_ptr<asio::ip::tcp::socket> socket) +EncodedData::send (DeadlineWrapper& wrapper) { stringstream s; s << _size; - asio::write (*socket, asio::buffer (s.str().c_str(), s.str().length() + 1)); - asio::write (*socket, asio::buffer (_data, _size)); + wrapper.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); + wrapper.write (_data, _size, 30); } #ifdef DEBUG_HASH diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h index ee54bc0f5..d82aee367 100644 --- 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<boost::asio::ip::tcp::socket>); + void send (DeadlineWrapper& wrapper); void write (boost::shared_ptr<const Options>, int); #ifdef DEBUG_HASH diff --git a/src/lib/server.cc b/src/lib/server.cc index d92fdf2b6..9e61c2282 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -133,7 +133,7 @@ Server::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 (socket); + encoded->send (wrapper); #ifdef DEBUG_HASH encoded->hash ("Encoded image (as made by server and as sent back)"); |
