Actually use YUV->RGB setting when converting.

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

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 3583a19c09d447e04e4e73dc7085757c832f53b0..9b3b3808b3886eabd44f36d5db9176039bdb1763 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -22,16 +22,8 @@
  *  encoding work, and a class to implement such a server.
  */
 
-#include <string>
-#include <vector>
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include <boost/scoped_array.hpp>
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include "server.h"
-#include "util.h"
-#include "scaler.h"
+#include "dcpomatic_socket.h"
 #include "image.h"
 #include "dcp_video.h"
 #include "config.h"
@@ -39,6 +31,13 @@
 #include "player_video.h"
 #include "encoded_data.h"
 #include "safe_stringstream.h"
+#include "raw_convert.h"
+#include <libcxml/cxml.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/scoped_array.hpp>
+#include <string>
+#include <vector>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -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)
@@ -118,7 +116,7 @@ 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 ();
+       shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally (boost::bind (&Log::dcp_log, _log.get(), _1, _2));
 
        gettimeofday (&after_encode, 0);