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 9b3b3808b3886eabd44f36d5db9176039bdb1763..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>
@@ -104,6 +104,9 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
        string s (buffer.get());
        shared_ptr<cxml::Document> xml (new cxml::Document ("EncodingRequest"));
        xml->read_string (s);
+       /* This is a double-check; the server shouldn't even be on the candidate list
+          if it is the wrong version, but it doesn't hurt to make sure here.
+       */
        if (xml->number_child<int> ("Version") != SERVER_LINK_VERSION) {
                cerr << "Mismatched server/client versions\n";
                LOG_ERROR_NC ("Mismatched server/client versions");
@@ -116,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());
@@ -248,6 +252,7 @@ Server::broadcast_received ()
                xmlpp::Document doc;
                xmlpp::Element* root = doc.create_root_node ("ServerAvailable");
                root->add_child("Threads")->add_child_text (raw_convert<string> (_worker_threads.size ()));
+               root->add_child("Version")->add_child_text (raw_convert<string> (SERVER_LINK_VERSION));
                string xml = doc.write_to_string ("UTF-8");
 
                if (_verbose) {