Call dcc_send_item directly

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Frediano Ziglio 2016-05-20 06:21:16 +01:00
parent 27145ed9aa
commit f12464b2f1
3 changed files with 4 additions and 9 deletions

View File

@ -2367,9 +2367,9 @@ static void reset_send_data(DisplayChannelClient *dcc)
memset(dcc->send_data.free_list.sync, 0, sizeof(dcc->send_data.free_list.sync));
}
void dcc_send_item(DisplayChannelClient *dcc, RedPipeItem *pipe_item)
void dcc_send_item(RedChannelClient *rcc, RedPipeItem *pipe_item)
{
RedChannelClient *rcc = RED_CHANNEL_CLIENT(dcc);
DisplayChannelClient *dcc = RCC_TO_DCC(rcc);
SpiceMarshaller *m = red_channel_client_get_marshaller(rcc);
reset_send_data(dcc);

View File

@ -203,7 +203,7 @@ void dcc_append_drawable (DisplayCha
void dcc_add_drawable_after (DisplayChannelClient *dcc,
Drawable *drawable,
RedPipeItem *pos);
void dcc_send_item (DisplayChannelClient *dcc,
void dcc_send_item (RedChannelClient *dcc,
RedPipeItem *item);
int dcc_clear_surface_drawables_from_pipe (DisplayChannelClient *dcc,
int surface_id,

View File

@ -1925,11 +1925,6 @@ static void on_disconnect(RedChannelClient *rcc)
display->glz_drawable_count);
}
static void send_item(RedChannelClient *rcc, RedPipeItem *item)
{
dcc_send_item(RCC_TO_DCC(rcc), item);
}
static int handle_migrate_flush_mark(RedChannelClient *rcc)
{
DisplayChannel *display_channel = SPICE_CONTAINEROF(rcc->channel, DisplayChannel, common.base);
@ -1969,7 +1964,7 @@ DisplayChannel* display_channel_new(SpiceServer *reds, RedWorker *worker,
DisplayChannel *display;
ChannelCbs cbs = {
.on_disconnect = on_disconnect,
.send_item = send_item,
.send_item = dcc_send_item,
.handle_migrate_flush_mark = handle_migrate_flush_mark,
.handle_migrate_data = handle_migrate_data,
.handle_migrate_data_get_serial = handle_migrate_data_get_serial