Merge master.

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

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 9c5a77f681b2903390fec271f5610c62cd2d8b16..5ca04c69249c2292b005432d0605ae021a72e546 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -29,6 +29,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/scoped_array.hpp>
+#include <libcxml/cxml.h>
 #include "server.h"
 #include "util.h"
 #include "scaler.h"
@@ -51,6 +52,19 @@ using boost::bind;
 using boost::scoped_array;
 using libdcp::Size;
 
+ServerDescription::ServerDescription (shared_ptr<const cxml::Node> node)
+{
+       _host_name = node->string_child ("HostName");
+       _threads = node->number_child<int> ("Threads");
+}
+
+void
+ServerDescription::as_xml (xmlpp::Node* root) const
+{
+       root->add_child("HostName")->add_child_text (_host_name);
+       root->add_child("Threads")->add_child_text (boost::lexical_cast<string> (_threads));
+}
+
 /** Create a server description from a string of metadata returned from as_metadata().
  *  @param v Metadata.
  *  @return ServerDescription, or 0.
@@ -68,15 +82,6 @@ ServerDescription::create_from_metadata (string v)
        return new ServerDescription (b[0], atoi (b[1].c_str ()));
 }
 
-/** @return Description of this server as text */
-string
-ServerDescription::as_metadata () const
-{
-       stringstream s;
-       s << _host_name << N_(" ") << _threads;
-       return s.str ();
-}
-
 Server::Server (shared_ptr<Log> log)
        : _log (log)
 {
@@ -93,45 +98,25 @@ Server::process (shared_ptr<Socket> socket)
        stringstream s (buffer.get());
        multimap<string, string> kv = read_key_value (s);
 
-       if (get_required_string (kv, N_("encode")) != N_("please")) {
+       if (get_required_string (kv, "encode") != "please") {
                return -1;
        }
 
-       libdcp::Size in_size (get_required_int (kv, N_("input_width")), get_required_int (kv, N_("input_height")));
-       int pixel_format_int = get_required_int (kv, N_("input_pixel_format"));
-       libdcp::Size out_size (get_required_int (kv, N_("output_width")), get_required_int (kv, N_("output_height")));
-       int padding = get_required_int (kv, N_("padding"));
-       int subtitle_offset = get_required_int (kv, N_("subtitle_offset"));
-       float subtitle_scale = get_required_float (kv, N_("subtitle_scale"));
-       string scaler_id = get_required_string (kv, N_("scaler"));
-       int frame = get_required_int (kv, N_("frame"));
-       int frames_per_second = get_required_int (kv, N_("frames_per_second"));
-       string post_process = get_optional_string (kv, N_("post_process"));
-       int colour_lut_index = get_required_int (kv, N_("colour_lut"));
-       int j2k_bandwidth = get_required_int (kv, N_("j2k_bandwidth"));
-       Position subtitle_position (get_optional_int (kv, N_("subtitle_x")), get_optional_int (kv, N_("subtitle_y")));
-       libdcp::Size subtitle_size (get_optional_int (kv, N_("subtitle_width")), get_optional_int (kv, N_("subtitle_height")));
+       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);
 
-       PixelFormat pixel_format = (PixelFormat) pixel_format_int;
-       Scaler const * scaler = Scaler::from_id (scaler_id);
-       
-       shared_ptr<Image> image (new SimpleImage (pixel_format, in_size, true));
+       shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, true));
 
        image->read_from_socket (socket);
 
-       shared_ptr<Subtitle> sub;
-       if (subtitle_size.width && subtitle_size.height) {
-               shared_ptr<Image> subtitle_image (new SimpleImage (PIX_FMT_RGBA, subtitle_size, true));
-               subtitle_image->read_from_socket (socket);
-               sub.reset (new Subtitle (subtitle_position, subtitle_image));
-       }
-
        DCPVideoFrame dcp_video_frame (
-               image, sub, out_size, padding, subtitle_offset, subtitle_scale,
-               scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log
+               image, frame, frames_per_second, colour_lut_index, j2k_bandwidth, _log
                );
        
        shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();