X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=79840c25bb2701bebc57f010fe764ae6c08348b0;hb=96a2b6f7ce0be67248cbc612e2ef03ea7d586039;hp=32e1e38b23f7148e0f7f1fa132fe2beaa4a8c0c4;hpb=bfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6;p=dcpomatic.git

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 32e1e38b2..79840c25b 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -24,15 +24,14 @@
 
 #include "server.h"
 #include "dcpomatic_socket.h"
-#include "scaler.h"
 #include "image.h"
 #include "dcp_video.h"
 #include "config.h"
 #include "cross.h"
 #include "player_video.h"
-#include "encoded_data.h"
+#include "data.h"
 #include "safe_stringstream.h"
-#include <dcp/raw_convert.h>
+#include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
@@ -63,7 +62,6 @@ using boost::bind;
 using boost::scoped_array;
 using boost::optional;
 using dcp::Size;
-using dcp::raw_convert;
 
 Server::Server (shared_ptr<Log> log, bool verbose)
 	: _terminate (false)
@@ -106,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");
@@ -117,13 +118,14 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
 	DCPVideo dcp_video_frame (pvf, xml, _log);
 
 	gettimeofday (&after_read, 0);
-	
-	shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally (boost::bind (&Log::dcp_log, _log.get(), _1, _2));
+
+	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());
@@ -148,7 +150,7 @@ Server::worker_thread ()
 
 		shared_ptr<Socket> socket = _queue.front ();
 		_queue.pop_front ();
-		
+
 		lock.unlock ();
 
 		int frame = -1;
@@ -158,9 +160,9 @@ Server::worker_thread ()
 		struct timeval after_read;
 		struct timeval after_encode;
 		struct timeval end;
-		
+
 		gettimeofday (&start, 0);
-		
+
 		try {
 			frame = process (socket, after_read, after_encode);
 			ip = socket->socket().remote_endpoint().address().to_string();
@@ -172,7 +174,7 @@ Server::worker_thread ()
 		gettimeofday (&end, 0);
 
 		socket.reset ();
-		
+
 		lock.lock ();
 
 		if (frame >= 0) {
@@ -186,14 +188,14 @@ Server::worker_thread ()
 				<< "receive " << (seconds(after_read) - seconds(start)) << "s "
 				<< "encode " << (seconds(after_encode) - seconds(after_read)) << "s "
 				<< "send " << (seconds(end) - seconds(after_encode)) << "s.";
-						   
+
 			if (_verbose) {
 				cout << message.str() << "\n";
 			}
 
 			LOG_GENERAL_NC (message.str ());
 		}
-		
+
 		_full_condition.notify_all ();
 	}
 }
@@ -205,13 +207,13 @@ Server::run (int num_threads)
 	if (_verbose) {
 		cout << "DCP-o-matic server starting with " << num_threads << " threads.\n";
 	}
-	
+
 	for (int i = 0; i < num_threads; ++i) {
 		_worker_threads.push_back (new thread (bind (&Server::worker_thread, this)));
 	}
 
 	_broadcast.thread = new thread (bind (&Server::broadcast_thread, this));
-	
+
 	start_accept ();
 	_io_service.run ();
 }
@@ -250,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) {
@@ -264,7 +267,7 @@ Server::broadcast_received ()
 
 		}
 	}
-		
+
 	_broadcast.socket->async_receive_from (
 		boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
 		_broadcast.send_endpoint, boost::bind (&Server::broadcast_received, this)
@@ -290,15 +293,15 @@ Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code cons
 	}
 
 	boost::mutex::scoped_lock lock (_worker_mutex);
-	
+
 	/* Wait until the queue has gone down a bit */
 	while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {
 		_full_condition.wait (lock);
 	}
-	
+
 	_queue.push_back (socket);
 	_empty_condition.notify_all ();
 
 	start_accept ();
 }
-	
+