X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=9af0883a7ae7c8bcdee206bda24eab402255c207;hb=57f229171a08567efeaed678381808173e4ef7a5;hp=5ca04c69249c2292b005432d0605ae021a72e546;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index 5ca04c692..9af0883a7 100644 --- 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" @@ -105,18 +104,14 @@ Server::process (shared_ptr 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"); - /* This checks that colour_lut_index is within range */ - colour_lut_index_to_name (colour_lut_index); - - shared_ptr image (new SimpleImage (PIX_FMT_RGB24, size, true)); + shared_ptr image (new Image (PIX_FMT_RGB24, size, true)); image->read_from_socket (socket); DCPVideoFrame dcp_video_frame ( - image, frame, frames_per_second, colour_lut_index, j2k_bandwidth, _log + image, frame, frames_per_second, j2k_bandwidth, _log ); shared_ptr encoded = dcp_video_frame.encode_locally ();