Rename EncodedData -> Data and trim it a bit.

[dcpomatic.git] / src / lib / server.cc

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 50ac4e786b6258a16f366a77dbfb4eaff674c82e..6dc79ec653e362de65c6d78f13eea7f500578018 100644 (file)
--- 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());