oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mixer_control: don't touch mixers of disabled outputs

Browse Source 
When an audio output device is disabled, also disable its mixer.
This commit is contained in:
Max Kellermann 2009-03-12 18:40:03 +01:00
parent c37567a14f
commit 0bc7f584f4
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mixer_control.c
View File

@ -33,6 +33,9 @@ mixer_control_setvol(unsigned int device, int volume, int rel)
assert(device < audio_output_count()); assert(device < audio_output_count());
output = audio_output_get(device); output = audio_output_get(device);
if (!output->enabled)
return false;
mixer = ao_plugin_get_mixer(output->plugin, output->data); mixer = ao_plugin_get_mixer(output->plugin, output->data);
if (mixer != NULL) { if (mixer != NULL) {
if (rel) { if (rel) {
@ -61,6 +64,9 @@ mixer_control_getvol(unsigned int device, int *volume)
assert(device < audio_output_count()); assert(device < audio_output_count());
output = audio_output_get(device); output = audio_output_get(device);
if (!output->enabled)
return false;
mixer = ao_plugin_get_mixer(output->plugin, output->data); mixer = ao_plugin_get_mixer(output->plugin, output->data);
if (mixer != NULL) { if (mixer != NULL) {
int volume2; int volume2;

9
src/output_command.c
View File

@ -26,6 +26,8 @@
#include "output_command.h" #include "output_command.h"
#include "output_all.h" #include "output_all.h"
#include "output_internal.h" #include "output_internal.h"
#include "output_plugin.h"
#include "mixer_api.h"
#include "idle.h" #include "idle.h"
bool bool
@ -48,6 +50,7 @@ bool
audio_output_disable_index(unsigned idx) audio_output_disable_index(unsigned idx)
{ {
struct audio_output *ao; struct audio_output *ao;
struct mixer *mixer;
if (idx >= audio_output_count()) if (idx >= audio_output_count())
return false; return false;
@ -57,5 +60,11 @@ audio_output_disable_index(unsigned idx)
ao->enabled = false; ao->enabled = false;
idle_add(IDLE_OUTPUT); idle_add(IDLE_OUTPUT);
mixer = ao_plugin_get_mixer(ao->plugin, ao->data);
if (mixer != NULL) {
mixer_close(mixer);
idle_add(IDLE_MIXER);
}
return true; return true;
} }