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

server: Give the SndChannel's ref and unref methods their expected name

Browse Source 
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Francois Gouget 2016-03-14 17:46:37 +01:00 committed by Jonathon Jongsma
parent 2480eb6979
commit 5bb27f240b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/sound.c
View File

@ -183,13 +183,13 @@ static uint32_t playback_compression = TRUE;
static void snd_receive(void* data);
static SndChannel *snd_channel_get(SndChannel *channel)
static SndChannel *snd_channel_ref(SndChannel *channel)
{
channel->refs++;
return channel;
}
static SndChannel *snd_channel_put(SndChannel *channel)
static SndChannel *snd_channel_unref(SndChannel *channel)
{
if (!--channel->refs) {
spice_printerr("SndChannel=%p freed", channel);
@ -226,7 +226,7 @@ static void snd_disconnect_channel(SndChannel *channel)
reds_stream_free(channel->stream);
channel->stream = NULL;
spice_marshaller_destroy(channel->send_data.marshaller);
snd_channel_put(channel);
snd_channel_unref(channel);
worker->connection = NULL;
}
@ -1100,7 +1100,7 @@ SPICE_GNUC_VISIBLE void spice_server_playback_get_buffer(SpicePlaybackInstance *
return;
}
spice_assert(playback_channel->base.active);
snd_channel_get(channel);
snd_channel_ref(channel);
*frame = playback_channel->free_frames->samples;
playback_channel->free_frames = playback_channel->free_frames->next;
@ -1115,7 +1115,7 @@ SPICE_GNUC_VISIBLE void spice_server_playback_put_samples(SpicePlaybackInstance
frame = SPICE_CONTAINEROF(samples, AudioFrame, samples[0]);
playback_channel = frame->channel;
spice_assert(playback_channel);
if (!snd_channel_put(&playback_channel->base) ||
if (!snd_channel_unref(&playback_channel->base) ||
sin->st->worker.connection != &playback_channel->base) {
/* lost last reference, channel has been destroyed previously */
spice_info("audio samples belong to a disconnected channel");