From 542086dd4537b852b61974f9bee4eabebde8505f Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 20 Sep 2013 13:25:53 +0200 Subject: af: merge af_reinit() and fix_output_format() Calling them separately doesn't really make sense, and all existing calls to them usually combined them. One subtitle difference was that af_init() didn't wipe the filter chain if initialization of the chain itself failed, but that didn't really make sense anyway. Also remove af_init() from the code for setting balance in mixer.c. The mixer should be in the initialized state only if audio is fully initialized, so the af_init() call made no sense. Note that the filter "editing" code in command.c doesn't really do a nice job of handling errors in case recreating an _old_ (known to work) filter chain unexpectedly fails, and this obscure/rare case might be differently handled after this change. --- audio/mixer.c | 1 - 1 file changed, 1 deletion(-) (limited to 'audio/mixer.c') diff --git a/audio/mixer.c b/audio/mixer.c index 0bc650c7e8..07ce229f73 100644 --- a/audio/mixer.c +++ b/audio/mixer.c @@ -238,7 +238,6 @@ void mixer_setbalance(struct mixer *mixer, float val) return; } - af_init(mixer->af); /* make all other channels pass thru since by default pan blocks all */ memset(level, 0, sizeof(level)); for (i = 2; i < AF_NCH; i++) { -- cgit v1.2.3