pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-08 19:19:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sound: Remove on_new_record_channel_client()

Browse Source 
It is only called from the constructor, so move all of the code into
that function.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Jonathon Jongsma 2017-04-19 10:45:56 -05:00
parent f37629996c
commit 8c88597b48
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/sound.c
View File

@ -1247,19 +1247,6 @@ SPICE_GNUC_VISIBLE void spice_server_set_record_rate(SpiceRecordInstance *sin, u
snd_set_rate(&sin->st->channel, frequency, SPICE_RECORD_CAP_OPUS);
}
static void on_new_record_channel_client(SndChannel *channel, SndChannelClient *client)
{
spice_assert(client);
channel->connection = client;
if (channel->volume.volume_nchannels) {
snd_set_command(client, SND_VOLUME_MUTE_MASK);
}
if (client->active) {
snd_set_command(client, SND_CTRL_MASK);
}
}
static void
record_channel_client_finalize(GObject *object)
{
@ -1276,14 +1263,22 @@ record_channel_client_constructed(GObject *object)
RecordChannelClient *record_client = RECORD_CHANNEL_CLIENT(object);
RedChannel *red_channel = red_channel_client_get_channel(RED_CHANNEL_CLIENT(record_client));
SndChannel *channel = SND_CHANNEL(red_channel);
SndChannelClient *scc = SND_CHANNEL_CLIENT(record_client);
G_OBJECT_CLASS(record_channel_client_parent_class)->constructed(object);
on_new_record_channel_client(channel, SND_CHANNEL_CLIENT(record_client));
channel->connection = scc;
if (channel->volume.volume_nchannels) {
snd_set_command(scc, SND_VOLUME_MUTE_MASK);
}
if (scc->active) {
snd_set_command(scc, SND_CTRL_MASK);
}
if (channel->active) {
snd_record_start(channel);
}
snd_send(SND_CHANNEL_CLIENT(record_client));
snd_send(scc);
}