summaryrefslogtreecommitdiff
path: root/src/lib/server.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-10 15:47:06 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-10 15:47:06 +0100
commitcc4a67b7eb8ecaed076e261960848f70e3e741af (patch)
treea41a122341543aee630d6842785d90830298a297 /src/lib/server.cc
parentd382f34db155ddaf4bb61538c18b87c7564e00b2 (diff)
Subs successfully exported with thumbs.
Diffstat (limited to 'src/lib/server.cc')
-rw-r--r--src/lib/server.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 28236e3e0..76989d078 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -115,16 +115,14 @@ Server::process (shared_ptr<Socket> socket)
shared_ptr<SimpleImage> image (new SimpleImage (pixel_format, in_size));
for (int i = 0; i < image->components(); ++i) {
- int line_size;
- s >> line_size;
- image->set_line_size (i, line_size);
- }
-
- for (int i = 0; i < image->components(); ++i) {
socket->read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30);
}
+
+ /* XXX: subtitle */
+ DCPVideoFrame dcp_video_frame (
+ image, shared_ptr<Subtitle> (), out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log
+ );
- DCPVideoFrame dcp_video_frame (image, out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log);
shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
encoded->send (socket);