[Spice-devel] [PATCH v10 04/11] sound: free SndChannel data in finalize()

[Frediano Ziglio]

Move the freeing of SndChannel data members from snd_detach_common() to
the finalize function to encapsulate things a bit more cleanly. It
doesn't really change the behavior or order of destruction since
snd_detach_common() destroys the channel.

Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
Acked-by: Jonathon Jongsma <jjongsma at redhat.com>
---
 server/sound.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/server/sound.c b/server/sound.c
index 6e30f68..bdd5f11 100644
--- a/server/sound.c
+++ b/server/sound.c
@@ -1433,10 +1433,26 @@ snd_channel_init(SndChannel *self)
 }
 
 static void
+snd_channel_finalize(GObject *object)
+{
+    SndChannel *channel = SND_CHANNEL(object);
+
+    remove_channel(channel);
+
+    free(channel->volume.volume);
+    channel->volume.volume = NULL;
+
+    G_OBJECT_CLASS(snd_channel_parent_class)->finalize(object);
+}
+
+static void
 snd_channel_class_init(SndChannelClass *klass)
 {
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
     RedChannelClass *channel_class = RED_CHANNEL_CLASS(klass);
 
+    object_class->finalize = snd_channel_finalize;
+
     channel_class->config_socket = snd_channel_config_socket;
     channel_class->alloc_recv_buf = snd_channel_client_alloc_recv_buf;
     channel_class->release_recv_buf = snd_channel_client_release_recv_buf;
@@ -1552,10 +1568,7 @@ static void snd_detach_common(SndChannel *channel)
     }
     RedsState *reds = red_channel_get_server(RED_CHANNEL(channel));
 
-    remove_channel(channel);
     reds_unregister_channel(reds, RED_CHANNEL(channel));
-    free(channel->volume.volume);
-    channel->volume.volume = NULL;
     red_channel_destroy(RED_CHANNEL(channel));
 }
 
-- 
git-series 0.9.1