[Spice-devel,v6,14/18] sound: Reuse code for migrating client channels

Submitted by Frediano Ziglio on Dec. 2, 2016, 10:54 a.m.

Details

Message ID e07410797b6e5b0afad682103e0b460710508801.1480676032.git-series.fziglio@redhat.com
State Accepted
Commit 6128aae6d2d910524501d4eb9df013f10bb372ca
Headers show
Series "Remove DummyChannel* objects" ( rev: 1 ) in Spice

Not browsing as part of any series.

Commit Message

Frediano Ziglio Dec. 2, 2016, 10:54 a.m.
We support only a single client so don't waste code just
to check this.
The worst stuff can happen is that we'll migrate multiple
connections.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 server/sound.c | 35 +++++------------------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

Patch hide | download patch | download mbox

diff --git a/server/sound.c b/server/sound.c
index a4313c4..191e4fe 100644
--- a/server/sound.c
+++ b/server/sound.c
@@ -1131,19 +1131,10 @@  static void snd_set_playback_peer(RedChannel *red_channel, RedClient *client, Re
                  TYPE_PLAYBACK_CHANNEL_CLIENT);
 }
 
-static void snd_record_migrate_channel_client(RedChannelClient *rcc)
+static void snd_migrate_channel_client(RedChannelClient *rcc)
 {
-    SndChannel *channel;
-    RedChannel *red_channel = red_channel_client_get_channel(rcc);
-
-    channel = SND_CHANNEL(red_channel);
-    spice_assert(channel);
-
-    if (channel->connection) {
-        spice_assert(RED_CHANNEL_CLIENT(channel->connection) == rcc);
-        snd_set_command(channel->connection, SND_MIGRATE_MASK);
-        snd_send(channel->connection);
-    }
+    snd_set_command(SND_CHANNEL_CLIENT(rcc), SND_MIGRATE_MASK);
+    snd_send(SND_CHANNEL_CLIENT(rcc));
 }
 
 SPICE_GNUC_VISIBLE void spice_server_record_set_volume(SpiceRecordInstance *sin,
@@ -1353,22 +1344,6 @@  static void snd_set_record_peer(RedChannel *red_channel, RedClient *client, Reds
                  TYPE_RECORD_CHANNEL_CLIENT);
 }
 
-static void snd_playback_migrate_channel_client(RedChannelClient *rcc)
-{
-    SndChannel *channel;
-    RedChannel *red_channel = red_channel_client_get_channel(rcc);
-
-    channel = SND_CHANNEL(red_channel);
-    spice_assert(channel);
-    spice_debug(NULL);
-
-    if (channel->connection) {
-        spice_assert(RED_CHANNEL_CLIENT(channel->connection) == rcc);
-        snd_set_command(channel->connection, SND_MIGRATE_MASK);
-        snd_send(channel->connection);
-    }
-}
-
 static void add_channel(SndChannel *channel)
 {
     channel->next = snd_channels;
@@ -1436,7 +1411,7 @@  playback_channel_constructed(GObject *object)
     G_OBJECT_CLASS(playback_channel_parent_class)->constructed(object);
 
     client_cbs.connect = snd_set_playback_peer;
-    client_cbs.migrate = snd_playback_migrate_channel_client;
+    client_cbs.migrate = snd_migrate_channel_client;
     red_channel_register_client_cbs(RED_CHANNEL(self), &client_cbs, self);
 
     if (snd_codec_is_capable(SPICE_AUDIO_DATA_MODE_CELT_0_5_1, SND_CODEC_ANY_FREQUENCY)) {
@@ -1486,7 +1461,7 @@  record_channel_constructed(GObject *object)
     G_OBJECT_CLASS(record_channel_parent_class)->constructed(object);
 
     client_cbs.connect = snd_set_record_peer;
-    client_cbs.migrate = snd_record_migrate_channel_client;
+    client_cbs.migrate = snd_migrate_channel_client;
     red_channel_register_client_cbs(RED_CHANNEL(self), &client_cbs, self);
 
     if (snd_codec_is_capable(SPICE_AUDIO_DATA_MODE_CELT_0_5_1, SND_CODEC_ANY_FREQUENCY)) {