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 5ca04c69249c2292b005432d0605ae021a72e546..e4c281172eb552ea7ca7e784a73b0fb08d530959 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -36,7 +36,6 @@
 #include "image.h"
 #include "dcp_video_frame.h"
 #include "config.h"
-#include "subtitle.h"
 
 #include "i18n.h"
 
@@ -50,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)
@@ -69,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)
@@ -105,18 +105,17 @@ Server::process (shared_ptr<Socket> socket)
        libdcp::Size size (get_required_int (kv, "width"), get_required_int (kv, "height"));
        int frame = get_required_int (kv, "frame");
        int frames_per_second = get_required_int (kv, "frames_per_second");
-       int colour_lut_index = get_required_int (kv, "colour_lut");
        int j2k_bandwidth = get_required_int (kv, "j2k_bandwidth");
+       Eyes eyes = static_cast<Eyes> (get_required_int (kv, "eyes"));
 
-       /* This checks that colour_lut_index is within range */
-       colour_lut_index_to_name (colour_lut_index);
-
-       shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, true));
+       shared_ptr<Image> image (new Image (PIX_FMT_RGB24, size, true));
 
        image->read_from_socket (socket);
 
+       /* XXX: colour conversion... */
+
        DCPVideoFrame dcp_video_frame (
-               image, frame, frames_per_second, colour_lut_index, j2k_bandwidth, _log
+               image, frame, eyes, ColourConversion(), frames_per_second, j2k_bandwidth, _log
                );
        
        shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();