summaryrefslogtreecommitdiff
path: root/src/lib/dcp_video_frame.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-09-23 17:50:31 +0100
committerCarl Hetherington <cth@carlh.net>2012-09-23 17:50:31 +0100
commite89fb9d81358b51ed0e231725f7fb6eb63f96c5b (patch)
tree7388764fb11b97f33c2ab9ffe8cea0679ce20d2e /src/lib/dcp_video_frame.cc
parent6726393a4b186333b8e1080f3f1c5c4b77d4c2e6 (diff)
Use io_service per thread.
Diffstat (limited to 'src/lib/dcp_video_frame.cc')
-rw-r--r--src/lib/dcp_video_frame.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index ee29d8601..5c0ec6a6a 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -297,10 +297,7 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
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);
- shared_ptr<asio::ip::tcp::socket> socket (new asio::ip::tcp::socket (io_service));
-
- DeadlineWrapper wrapper (io_service);
- wrapper.set_socket (socket);
+ DeadlineWrapper wrapper;
wrapper.connect (*endpoint_iterator, 30);
@@ -378,12 +375,12 @@ EncodedData::write (shared_ptr<const Options> opt, int frame)
* @param socket Socket
*/
void
-EncodedData::send (DeadlineWrapper& wrapper)
+EncodedData::send (shared_ptr<DeadlineWrapper> wrapper)
{
stringstream s;
s << _size;
- wrapper.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30);
- wrapper.write (_data, _size, 30);
+ wrapper->write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30);
+ wrapper->write (_data, _size, 30);
}
#ifdef DEBUG_HASH