Try to actually use colour conversion; bump libdcp in cscript.

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

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 37a076a5485d55e6174e3e7355a74027b049bfc9..e4c281172eb552ea7ca7e784a73b0fb08d530959 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -49,6 +49,7 @@ using boost::algorithm::split;
 using boost::thread;
 using boost::bind;
 using boost::scoped_array;
+using boost::optional;
 using libdcp::Size;
 
 ServerDescription::ServerDescription (shared_ptr<const cxml::Node> node)
@@ -68,17 +69,17 @@ ServerDescription::as_xml (xmlpp::Node* root) const
  *  @param v Metadata.
  *  @return ServerDescription, or 0.
  */
-ServerDescription *
+optional<ServerDescription>
 ServerDescription::create_from_metadata (string v)
 {
        vector<string> b;
        split (b, v, is_any_of (N_(" ")));
 
        if (b.size() != 2) {
-               return 0;
+               return optional<ServerDescription> ();
        }
 
-       return new ServerDescription (b[0], atoi (b[1].c_str ()));
+       return ServerDescription (b[0], atoi (b[1].c_str ()));
 }
 
 Server::Server (shared_ptr<Log> log)
@@ -111,8 +112,10 @@ Server::process (shared_ptr<Socket> socket)
 
        image->read_from_socket (socket);
 
+       /* XXX: colour conversion... */
+
        DCPVideoFrame dcp_video_frame (
-               image, frame, eyes, frames_per_second, j2k_bandwidth, _log
+               image, frame, eyes, ColourConversion(), frames_per_second, j2k_bandwidth, _log
                );
        
        shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();