From 0bc7f584f44803cda2c0a3d36dbef127161663d6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 12 Mar 2009 18:40:03 +0100 Subject: mixer_control: don't touch mixers of disabled outputs When an audio output device is disabled, also disable its mixer. --- src/mixer_control.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/mixer_control.c') diff --git a/src/mixer_control.c b/src/mixer_control.c index a43230d5a..f583696e8 100644 --- a/src/mixer_control.c +++ b/src/mixer_control.c @@ -33,6 +33,9 @@ mixer_control_setvol(unsigned int device, int volume, int rel) assert(device < audio_output_count()); output = audio_output_get(device); + if (!output->enabled) + return false; + mixer = ao_plugin_get_mixer(output->plugin, output->data); if (mixer != NULL) { if (rel) { @@ -61,6 +64,9 @@ mixer_control_getvol(unsigned int device, int *volume) assert(device < audio_output_count()); output = audio_output_get(device); + if (!output->enabled) + return false; + mixer = ao_plugin_get_mixer(output->plugin, output->data); if (mixer != NULL) { int volume2; -- cgit v1.2.3