Skip to content

M
mpd
Commit 766905ba authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/alsa: merge alsa_data_free() into destructor

parent a29c64b6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
src/output/alsa_output_plugin.c
View file @ 766905ba
...@@ -112,13 +112,6 @@ alsa_data_new(void) ...@@ -112,13 +112,6 @@ alsa_data_new(void)
} }
static void 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) alsa_configure(struct alsa_data *ad, const struct config_param *param)
{ {
ad->device = config_dup_block_string(param, "device", NULL); ad->device = config_dup_block_string(param, "device", NULL);
...@@ -166,7 +159,9 @@ alsa_finish(struct audio_output *ao) ...@@ -166,7 +159,9 @@ alsa_finish(struct audio_output *ao)
struct alsa_data *ad = (struct alsa_data *)ao; struct alsa_data *ad = (struct alsa_data *)ao;
ao_base_finish(&ad->base); ao_base_finish(&ad->base);
alsa_data_free(ad);
g_free(ad->device);
g_free(ad);
/* free libasound's config cache */ /* free libasound's config cache */
snd_config_update_free_global(); snd_config_update_free_global();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment