From 1fcf09a816977db8e12e4534d7c4ced5c053f0de Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 26 Mar 2009 19:46:33 +0100 Subject: mixer_control: close mixer on failure When getting or setting the volume fails, the MPD core close the mixer. Moved the duplicated code from the mixer plugins. --- src/mixer/alsa_mixer.c | 3 --- src/mixer/oss_mixer.c | 2 -- 2 files changed, 5 deletions(-) (limited to 'src/mixer') diff --git a/src/mixer/alsa_mixer.c b/src/mixer/alsa_mixer.c index c5aac13d4..892cef2b4 100644 --- a/src/mixer/alsa_mixer.c +++ b/src/mixer/alsa_mixer.c @@ -162,7 +162,6 @@ alsa_mixer_get_volume(struct mixer *mixer) if (err < 0) { g_warning("problems getting alsa volume: %s (snd_mixer_%s)\n", snd_strerror(err), "handle_events"); - alsa_mixer_close(mixer); return false; } @@ -172,7 +171,6 @@ alsa_mixer_get_volume(struct mixer *mixer) if (err < 0) { g_warning("problems getting alsa volume: %s (snd_mixer_%s)\n", snd_strerror(err), "selem_get_playback_volume"); - alsa_mixer_close(mixer); return false; } @@ -216,7 +214,6 @@ alsa_mixer_set_volume(struct mixer *mixer, unsigned volume) if (err < 0) { g_warning("problems setting alsa volume: %s\n", snd_strerror(err)); - alsa_mixer_close(mixer); return false; } diff --git a/src/mixer/oss_mixer.c b/src/mixer/oss_mixer.c index 13e325823..96339e85c 100644 --- a/src/mixer/oss_mixer.c +++ b/src/mixer/oss_mixer.c @@ -150,7 +150,6 @@ oss_mixer_get_volume(struct mixer *mixer) ret = ioctl(om->device_fd, MIXER_READ(om->volume_control), &level); if (ret < 0) { - oss_mixer_close(mixer); g_warning("unable to read oss volume\n"); return false; } @@ -184,7 +183,6 @@ oss_mixer_set_volume(struct mixer *mixer, unsigned volume) ret = ioctl(om->device_fd, MIXER_WRITE(om->volume_control), &level); if (ret < 0) { g_warning("unable to set oss volume\n"); - oss_mixer_close(mixer); return false; } -- cgit v1.2.3