pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-27 23:49:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

streaming: Remove unused detach_stream() argument

Browse Source 
After the removal of Drawable::sized_stream, the last argument to
detach_stream() is no longer used.
This commit is contained in:
Francois Gouget 2016-06-10 12:43:16 +02:00 committed by Christophe Fergeau
parent 42a5794845
commit 47509b1e6e
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/display-channel.c
View File

@ -1337,7 +1337,7 @@ void drawable_unref(Drawable *drawable)
spice_warn_if_fail(ring_is_empty(&drawable->pipes));
if (drawable->stream) {
detach_stream(display, drawable->stream, TRUE);
detach_stream(display, drawable->stream);
}
region_destroy(&drawable->tree_item.base.rgn);

13
server/stream.c
View File

@ -321,8 +321,7 @@ static void attach_stream(DisplayChannel *display, Drawable *drawable, Stream *s
}
}
void detach_stream(DisplayChannel *display, Stream *stream,
int detach_sized)
void detach_stream(DisplayChannel *display, Stream *stream)
{
spice_assert(stream->current && stream->current->stream);
spice_assert(stream->current->stream == stream);
@ -526,7 +525,7 @@ void stream_trace_update(DisplayChannel *display, Drawable *drawable)
if (stream->current) {
stream->current->streamable = FALSE; //prevent item trace
before_reattach_stream(display, stream, drawable);
detach_stream(display, stream, FALSE);
detach_stream(display, stream);
}
attach_stream(display, drawable, stream);
return;
@ -568,7 +567,7 @@ void stream_maintenance(DisplayChannel *display,
stream, TRUE);
if (is_next_frame != STREAM_FRAME_NONE) {
before_reattach_stream(display, stream, candidate);
detach_stream(display, stream, FALSE);
detach_stream(display, stream);
prev->streamable = FALSE; //prevent item trace
attach_stream(display, candidate, stream);
}
@ -859,7 +858,7 @@ static void detach_stream_gracefully(DisplayChannel *display, Stream *stream,
dcc_detach_stream_gracefully(dcc, stream, update_area_limit);
}
if (stream->current) {
detach_stream(display, stream, TRUE);
detach_stream(display, stream);
}
}
@ -896,11 +895,11 @@ void stream_detach_behind(DisplayChannel *display, QRegion *region, Drawable *dr
}
}
if (detach && stream->current) {
detach_stream(display, stream, TRUE);
detach_stream(display, stream);
} else if (!is_connected) {
if (stream->current &&
region_intersects(&stream->current->tree_item.base.rgn, region)) {
detach_stream(display, stream, TRUE);
detach_stream(display, stream);
}
}
}

2
server/stream.h
View File

@ -161,6 +161,6 @@ void stream_agent_unref (DisplayChan
StreamAgent *agent);
void stream_agent_stop (StreamAgent *agent);
void detach_stream(DisplayChannel *display, Stream *stream, int detach_sized);
void detach_stream(DisplayChannel *display, Stream *stream);
#endif /* STREAM_H */