diff options
| author | Frediano Ziglio <fziglio@redhat.com> | 2017-12-08 12:07:51 +0000 |
|---|---|---|
| committer | Frediano Ziglio <freddy77@gmail.com> | 2023-11-22 07:39:18 +0000 |
| commit | 08e400c22ccd56f370d1d235d74e62c89df964d9 (patch) | |
| tree | 0dc3d5e35a00804b63ede4c6637db3bd3a2edc03 | |
| parent | a89b4086f5fe23d528ded74f55e475198b88bff0 (diff) | |
fix some function names
| -rw-r--r-- | server/dcc.cpp | 2 | ||||
| -rw-r--r-- | server/display-channel.cpp | 6 | ||||
| -rw-r--r-- | server/video-stream.cpp | 4 | ||||
| -rw-r--r-- | server/video-stream.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/server/dcc.cpp b/server/dcc.cpp index 42b965e8..ac4e9134 100644 --- a/server/dcc.cpp +++ b/server/dcc.cpp @@ -869,7 +869,7 @@ static int dcc_handle_preferred_video_codec_type(DisplayChannelClient *dcc, /* New client preference */ dcc_update_preferred_video_codecs(dcc); - video_stream_detach_and_stop(&DCC_TO_DC(dcc)->priv->streams); + video_streams_detach_and_stop(&DCC_TO_DC(dcc)->priv->streams); return TRUE; } diff --git a/server/display-channel.cpp b/server/display-channel.cpp index 5429d1c7..bfd1edde 100644 --- a/server/display-channel.cpp +++ b/server/display-channel.cpp @@ -136,12 +136,12 @@ int display_channel_get_streams_timeout(DisplayChannel *display) void display_channel_stream_detach_and_stop(DisplayChannel *display) { - video_stream_detach_and_stop(&display->priv->streams); + video_streams_detach_and_stop(&display->priv->streams); } void display_channel_stream_timeout(DisplayChannel *display) { - video_stream_timeout(&display->priv->streams); + video_streams_timeout(&display->priv->streams); } void display_channel_set_stream_video(DisplayChannel *display, int stream_video) @@ -163,7 +163,7 @@ void display_channel_set_video_codecs(DisplayChannel *display, GArray *video_cod dcc_video_codecs_update(dcc); } - video_stream_detach_and_stop(&display->priv->streams); + video_streams_detach_and_stop(&display->priv->streams); } GArray *display_channel_get_video_codecs(DisplayChannel *display) diff --git a/server/video-stream.cpp b/server/video-stream.cpp index bbf989e5..f1aa3af3 100644 --- a/server/video-stream.cpp +++ b/server/video-stream.cpp @@ -987,7 +987,7 @@ void video_streams_detach_behind(VideoStreams *streams, } } -void video_stream_detach_and_stop(VideoStreams *streams) +void video_streams_detach_and_stop(VideoStreams *streams) { RingItem *stream_item; @@ -1000,7 +1000,7 @@ void video_stream_detach_and_stop(VideoStreams *streams) } } -void video_stream_timeout(VideoStreams *streams) +void video_streams_timeout(VideoStreams *streams) { Ring *ring = &streams->streams; RingItem *item; diff --git a/server/video-stream.h b/server/video-stream.h index 438a4bf3..6dd16181 100644 --- a/server/video-stream.h +++ b/server/video-stream.h @@ -214,8 +214,8 @@ void video_streams_update_visible_region(VideoStreams *streams, Drawable *drawab void video_streams_trace_update(VideoStreams *streams, Drawable *drawable); void video_streams_maintenance(VideoStreams *streams, Drawable *candidate, Drawable *prev); -void video_stream_timeout(VideoStreams *streams); -void video_stream_detach_and_stop(VideoStreams *streams); +void video_streams_timeout(VideoStreams *streams); +void video_streams_detach_and_stop(VideoStreams *streams); void video_streams_trace_add_drawable(VideoStreams *streams, Drawable *item); void video_streams_detach_behind(VideoStreams *streams, QRegion *region, Drawable *drawable); |