From 766905ba9f211ec5b769fce160f2ed5ed2253b46 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 21 Mar 2012 18:51:31 +0100 Subject: output/alsa: merge alsa_data_free() into destructor --- src/output/alsa_output_plugin.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/output/alsa_output_plugin.c b/src/output/alsa_output_plugin.c index adfbc9f0d..35bea3ce5 100644 --- a/src/output/alsa_output_plugin.c +++ b/src/output/alsa_output_plugin.c @@ -111,13 +111,6 @@ alsa_data_new(void) return ret; } -static void -alsa_data_free(struct alsa_data *ad) -{ - g_free(ad->device); - g_free(ad); -} - static void alsa_configure(struct alsa_data *ad, const struct config_param *param) { @@ -166,7 +159,9 @@ alsa_finish(struct audio_output *ao) struct alsa_data *ad = (struct alsa_data *)ao; ao_base_finish(&ad->base); - alsa_data_free(ad); + + g_free(ad->device); + g_free(ad); /* free libasound's config cache */ snd_config_update_free_global(); -- cgit v1.2.3