From 8cf206f2eeb8a7612be9e898a54e066d9b110e90 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 26 Mar 2009 19:50:15 +0100 Subject: pulse_mixer: initialize "online" and "index" in open() The attributes "online" and "index" were not properly reinitialized after a close/open cycle. --- src/mixer/pulse_mixer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mixer') diff --git a/src/mixer/pulse_mixer.c b/src/mixer/pulse_mixer.c index 0a83755f..b1067ae9 100644 --- a/src/mixer/pulse_mixer.c +++ b/src/mixer/pulse_mixer.c @@ -165,7 +165,6 @@ pulse_mixer_init(const struct config_param *param) pm->mainloop=NULL; pm->volume=NULL; pm->output_name=NULL; - pm->index=0; pm->online=false; pm->volume = g_new(struct pa_cvolume,1); @@ -184,7 +183,6 @@ pulse_mixer_finish(struct mixer *data) pm->context = NULL; pm->mainloop = NULL; pm->volume = NULL; - pm->online = false; g_free(pm); } @@ -226,6 +224,9 @@ pulse_mixer_open(G_GNUC_UNUSED struct mixer *data) struct pulse_mixer *pm = (struct pulse_mixer *) data; g_debug("pulse mixer open"); + pm->index = 0; + pm->online = false; + if(!(pm->mainloop = pa_threaded_mainloop_new())) { g_debug("failed mainloop"); return false; @@ -267,6 +268,8 @@ pulse_mixer_close(G_GNUC_UNUSED struct mixer *data) pa_threaded_mainloop_free(pm->mainloop); pm->mainloop = NULL; } + + pm->online = false; } static int -- cgit v1.2.3