diff options
author | Alon Levy <alevy@redhat.com> | 2010-11-08 01:41:59 +0200 |
---|---|---|
committer | Alon Levy <alevy@redhat.com> | 2010-11-08 01:41:59 +0200 |
commit | 26aec2374a035780620649f9d506670b5338c85f (patch) | |
tree | 0b727fb57c3c77f597bef474efb256a11c15eb99 | |
parent | 85604a593d55a72997d5bc229b729c7da715181a (diff) | |
download | spice-26aec2374a035780620649f9d506670b5338c85f.tar.gz spice-26aec2374a035780620649f9d506670b5338c85f.tar.xz spice-26aec2374a035780620649f9d506670b5338c85f.zip |
server/red_worker: match channel_release_pipe_item_proc to red_channel
-rw-r--r-- | server/red_worker.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index c1cf45f0..352aa69f 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -350,7 +350,7 @@ typedef struct LocalCursor { typedef struct RedChannel RedChannel; typedef void (*channel_disconnect_proc)(RedChannel *channel); typedef void (*channel_hold_item_proc)(PipeItem *item); -typedef void (*channel_release_pipe_item_proc)(RedChannel *channel, void *item); +typedef void (*channel_release_pipe_item_proc)(RedChannel *channel, PipeItem *item, int item_pushed); typedef int (*handle_parsed_proc)(RedChannel *channel, uint32_t size, uint16_t type, void *message); struct RedChannel { @@ -1845,7 +1845,8 @@ static void red_clear_surface_drawables_from_pipe(RedWorker *worker, int surface PipeItem *tmp_item = item; item = (PipeItem *)ring_prev(ring, (RingItem *)item); ring_remove(&tmp_item->link); - worker->display_channel->common.base.release_item(&worker->display_channel->common.base, tmp_item); + worker->display_channel->common.base.release_item( + &worker->display_channel->common.base, tmp_item, FALSE); worker->display_channel->common.base.pipe_size--; if (!item) { @@ -7344,7 +7345,7 @@ static void inline channel_release_res(RedChannel *channel) if (!channel->send_data.item) { return; } - channel->release_item(channel, channel->send_data.item); + channel->release_item(channel, channel->send_data.item, FALSE); channel->send_data.item = NULL; } @@ -7358,7 +7359,7 @@ static void red_send_data(RedChannel *channel) if (!n) { channel->send_data.blocked = FALSE; if (channel->send_data.item) { - channel->release_item(channel, channel->send_data.item); + channel->release_item(channel, channel->send_data.item, FALSE); channel->send_data.item = NULL; } break; @@ -9475,12 +9476,12 @@ static void display_channel_hold_item(PipeItem *item) } } -static void display_channel_release_item(RedChannel *channel, void *item) +static void display_channel_release_item(RedChannel *channel, PipeItem *item, int item_pushed /* ignored */) { CommonChannel *common = SPICE_CONTAINEROF(channel, CommonChannel, base); ASSERT(item); - switch (((PipeItem *)item)->type) { + switch (item->type) { case PIPE_ITEM_TYPE_DRAW: case PIPE_ITEM_TYPE_STREAM_CREATE: release_drawable(common->worker, SPICE_CONTAINEROF(item, Drawable, pipe_item)); @@ -9618,12 +9619,12 @@ static void cursor_channel_hold_item(PipeItem *item) ((CursorItem *)item)->refs++; } -static void cursor_channel_release_item(RedChannel *channel, void *item) +static void cursor_channel_release_item(RedChannel *channel, PipeItem *item, int item_pushed) { CommonChannel *common = SPICE_CONTAINEROF(channel, CommonChannel, base); ASSERT(item); - red_release_cursor(common->worker, item); + red_release_cursor(common->worker, SPICE_CONTAINEROF(item, CursorItem, pipe_data)); } static void red_connect_cursor(RedWorker *worker, RedsStreamContext *peer, int migrate) @@ -9772,7 +9773,7 @@ static void red_wait_pipe_item_sent(RedChannel *channel, PipeItem *item) } } - channel->release_item(channel, item); + channel->release_item(channel, item, FALSE); red_unref_channel(channel); } |