summaryrefslogtreecommitdiff
path: root/src/lib/dcp_video.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-06 19:59:47 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-11 11:56:22 +0000
commit17df947ac256397311a11894062070f8069c7e75 (patch)
treebb84d231ae31cab2e7e4d6546c62fcd88150b4d8 /src/lib/dcp_video.cc
parentd499ec381ea5fbbae954531be9d66c9cc723c230 (diff)
Rename Server -> EncodeServer, ServerFinder -> EncodeServerFinder, ServerDescription -> EncodeServerDescription.
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 26113a184..cd7d5229e 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -31,7 +31,7 @@
#include "dcp_video.h"
#include "config.h"
#include "exceptions.h"
-#include "server_description.h"
+#include "encode_server_description.h"
#include "dcpomatic_socket.h"
#include "image.h"
#include "log.h"
@@ -151,7 +151,7 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
* @return Encoded data.
*/
Data
-DCPVideo::encode_remotely (ServerDescription serv, int timeout)
+DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
{
boost::asio::io_service io_service;
boost::asio::ip::tcp::resolver resolver (io_service);