pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-08 12:24:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

stream-device: Create channel when needed

Browse Source 
This allows a better id allocation as devices are created after
fixed ones.
Also will allow to support more easily multiple monitor.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Frediano Ziglio 2017-08-25 00:02:54 +01:00
parent 82769e5dfc
commit b7c3636151
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server/stream-device.c
View File

@ -72,7 +72,7 @@ stream_device_read_msg_from_dev(RedCharDevice *self, SpiceCharDeviceInstance *si
int n;
bool handled = false;
if (dev->has_error) {
if (dev->has_error || !dev->stream_channel) {
return NULL;
}
@ -238,11 +238,7 @@ stream_device_connect(RedsState *reds, SpiceCharDeviceInstance *sin)
{
SpiceCharDeviceInterface *sif;
StreamChannel *stream_channel = stream_channel_new(reds, 1); // TODO id
StreamDevice *dev = stream_device_new(sin, reds);
dev->stream_channel = stream_channel;
stream_channel_register_start_cb(stream_channel, stream_device_stream_start, dev);
sif = spice_char_device_get_interface(sin);
if (sif->state) {
@ -264,6 +260,33 @@ stream_device_dispose(GObject *object)
}
}
static void
allocate_channels(StreamDevice *dev)
{
if (dev->stream_channel) {
return;
}
SpiceServer* reds = red_char_device_get_server(RED_CHAR_DEVICE(dev));
int id = reds_get_free_channel_id(reds, SPICE_CHANNEL_DISPLAY);
g_return_if_fail(id >= 0);
StreamChannel *stream_channel = stream_channel_new(reds, id);
dev->stream_channel = stream_channel;
stream_channel_register_start_cb(stream_channel, stream_device_stream_start, dev);
}
static void
reset_channels(StreamDevice *dev)
{
if (dev->stream_channel) {
stream_channel_reset(dev->stream_channel);
}
}
static void
stream_device_port_event(RedCharDevice *char_dev, uint8_t event)
{
@ -275,10 +298,13 @@ stream_device_port_event(RedCharDevice *char_dev, uint8_t event)
// reset device and channel on close/open
dev->opened = (event == SPICE_PORT_EVENT_OPENED);
if (dev->opened) {
allocate_channels(dev);
}
dev->hdr_pos = 0;
dev->has_error = false;
red_char_device_reset(char_dev);
stream_channel_reset(dev->stream_channel);
reset_channels(dev);
}
static void