summaryrefslogtreecommitdiff
path: root/src/lib/server.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-10 14:04:10 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-10 14:04:10 +0100
commit5c0a67869dbddb924c9f5ccb4126aa06d85b9b8b (patch)
treec923ed014e373f5ad84cfe82f3736bcba6b7eabf /src/lib/server.cc
parent717ad0a42f8f3b744ad3bffcb094518ad59ef7b3 (diff)
Rename EncodedData -> Data and trim it a bit.
Diffstat (limited to 'src/lib/server.cc')
-rw-r--r--src/lib/server.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 50ac4e786..6dc79ec65 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -29,7 +29,7 @@
#include "config.h"
#include "cross.h"
#include "player_video.h"
-#include "encoded_data.h"
+#include "data.h"
#include "safe_stringstream.h"
#include "raw_convert.h"
#include <libcxml/cxml.h>
@@ -119,12 +119,13 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
gettimeofday (&after_read, 0);
- shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally (boost::bind (&Log::dcp_log, _log.get(), _1, _2));
+ shared_ptr<Data> encoded = dcp_video_frame.encode_locally (boost::bind (&Log::dcp_log, _log.get(), _1, _2));
gettimeofday (&after_encode, 0);
try {
- encoded->send (socket);
+ socket->write (encoded->size ());
+ socket->write (encoded->data ().get (), encoded->size ());
} catch (std::exception& e) {
cerr << "Send failed; frame " << dcp_video_frame.index() << "\n";
LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index());