summaryrefslogtreecommitdiff
path: root/src/lib/dcp_video.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-06 21:58:26 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-06 21:58:26 +0000
commit53ca2dda0e9138a251adc186a745f7943fc1abc1 (patch)
tree4c91e42b4fc166545fcd81288d595a206bb0ceed /src/lib/dcp_video.cc
parenta648da822a8ef304417beb17bb0224501333f94a (diff)
Increase timeout on client-server-test.
Diffstat (limited to 'src/lib/dcp_video.cc')
-rw-r--r--src/lib/dcp_video.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index acc389d96..7987f92b4 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -153,14 +153,14 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
* @return Encoded data.
*/
Data
-DCPVideo::encode_remotely (ServerDescription serv)
+DCPVideo::encode_remotely (ServerDescription serv, int timeout)
{
boost::asio::io_service io_service;
boost::asio::ip::tcp::resolver resolver (io_service);
boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert<string> (Config::instance()->server_port_base ()));
boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
- shared_ptr<Socket> socket (new Socket);
+ shared_ptr<Socket> socket (new Socket (timeout));
socket->connect (*endpoint_iterator);