pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-05 04:02:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move capability initialisation into channel creation

Browse Source 
No reason why RedWorker should know the capabilities of
DisplayChannel.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Frediano Ziglio 2016-10-25 13:42:32 +01:00
parent 96818da95d
commit 2307bb45b5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/display-channel.c
View File

@ -2027,6 +2027,7 @@ static void
display_channel_constructed(GObject *object)
{
DisplayChannel *self = DISPLAY_CHANNEL(object);
RedChannel *channel = RED_CHANNEL(self);
G_OBJECT_CLASS(display_channel_parent_class)->constructed(object);
@ -2039,7 +2040,6 @@ display_channel_constructed(GObject *object)
stat_init(&self->priv->__exclude_stat, "__exclude", CLOCK_THREAD_CPUTIME_ID);
#ifdef RED_STATISTICS
RedsState *reds = red_channel_get_server(RED_CHANNEL(self));
RedChannel *channel = RED_CHANNEL(self);
self->priv->cache_hits_counter =
stat_add_counter(reds, red_channel_get_stat_node(channel),
"cache_hits", TRUE);
@ -2053,6 +2053,10 @@ display_channel_constructed(GObject *object)
image_cache_init(&self->priv->image_cache);
self->priv->stream_video = SPICE_STREAM_VIDEO_OFF;
display_channel_init_streams(self);
red_channel_set_cap(channel, SPICE_DISPLAY_CAP_MONITORS_CONFIG);
red_channel_set_cap(channel, SPICE_DISPLAY_CAP_PREF_COMPRESSION);
red_channel_set_cap(channel, SPICE_DISPLAY_CAP_STREAM_REPORT);
}
void display_channel_process_surface_cmd(DisplayChannel *display,

3
server/red-worker.c
View File

@ -1379,9 +1379,6 @@ RedWorker* red_worker_new(QXLInstance *qxl,
red_channel_set_stat_node(channel, stat_add_node(reds, worker->stat, "display_channel", TRUE));
red_channel_register_client_cbs(channel, client_display_cbs, dispatcher);
g_object_set_data(G_OBJECT(channel), "dispatcher", dispatcher);
red_channel_set_cap(channel, SPICE_DISPLAY_CAP_MONITORS_CONFIG);
red_channel_set_cap(channel, SPICE_DISPLAY_CAP_PREF_COMPRESSION);
red_channel_set_cap(channel, SPICE_DISPLAY_CAP_STREAM_REPORT);
reds_register_channel(reds, channel);
return worker;