--- a/web_main.c	Sun Jun 08 21:03:23 2008 +0300
+++ b/web_main.c	Sun Jun 08 23:10:36 2008 +0300
@@ -44,7 +44,7 @@
 
     int headers_sent;
     
-    struct render_remote *render_info;
+    struct render_multi *render_info;
 
     size_t bytes_sent;
 
@@ -56,7 +56,7 @@
 
 static void _render_cleanup (struct render_request *ctx) {
     if (ctx->render_info)
-        render_remote_free(ctx->render_info);
+        render_multi_free(ctx->render_info);
 
     free(ctx);
 }
@@ -81,7 +81,7 @@
 
     size_t buf_size = EVBUFFER_LENGTH(buf);
 
-    assert(buf_size > 0);   // shouldn't happen anymore with the new render_remote
+    assert(buf_size > 0);   // shouldn't happen anymore with the new render_multi
     
     // check if we are paused
     if (ctx->paused) {
@@ -137,7 +137,7 @@
     printf("render [%p]: lost http connection\n", ctx);
 
     // cancel
-    render_remote_cancel(ctx->render_info);
+    render_multi_cancel(ctx->render_info);
     ctx->render_info = NULL;
 
     _render_cleanup(ctx);
@@ -152,7 +152,7 @@
     ctx->paused = 0;
 
     // any data waiting in the buffer?
-    render_remote_flush(ctx->render_info);
+    render_multi_flush(ctx->render_info);
 }
 
 static void _http_render_execute (struct evhttp_request *request, u_int32_t img_w, u_int32_t img_h) {
@@ -178,14 +178,8 @@
     if (render_region_full(&render))
         ERROR("render_region_full");
 
-    // pick a render_node
-    struct remote_node *node_info;
-
-    if ((node_info = remote_pool_get(&remote_pool)) == NULL)
-        ERROR("remote_pool_get");
-
     // initiate the remote render operation
-    if ((ctx->render_info = render_remote(&render, node_info,
+    if ((ctx->render_info = render_multi(&render, &remote_pool,
         &_render_sent,
         &_render_data,
         &_render_done,
@@ -195,7 +189,7 @@
         ERROR("render_multi");
     
     // set chunk size
-    render_remote_set_recv(ctx->render_info, MIN_CHUNK_SIZE, OVERFLOW_BUFFER);
+    render_multi_set_recv(ctx->render_info, MIN_CHUNK_SIZE, OVERFLOW_BUFFER);
 
     // set close cb
     evhttp_set_reply_abortcb(request, &_render_http_lost, ctx);