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

alsa_mixer: removed superfluous checks

Browse Source 
The MPD core guarantees that methods are always invoked in a
consistent state.  This means we can remove lots of checks from the
volume methods.
This commit is contained in:
Max Kellermann 2009-03-26 19:49:31 +01:00
parent 331b714a7a
commit 0c9799babe
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mixer/alsa_mixer.c
View File

@ -52,10 +52,6 @@ alsa_mixer_init(const struct config_param *param)
am->control = config_get_block_string(param, "mixer_control", am->control = config_get_block_string(param, "mixer_control",
VOLUME_MIXER_ALSA_CONTROL_DEFAULT); VOLUME_MIXER_ALSA_CONTROL_DEFAULT);
am->handle = NULL;
am->elem = NULL;
am->volume_min = 0;
am->volume_max = 0;
am->volume_set = -1; am->volume_set = -1;
return &am->base; return &am->base;
@ -73,8 +69,10 @@ static void
alsa_mixer_close(struct mixer *data) alsa_mixer_close(struct mixer *data)
{ {
struct alsa_mixer *am = (struct alsa_mixer *)data; struct alsa_mixer *am = (struct alsa_mixer *)data;
if (am->handle) snd_mixer_close(am->handle);
am->handle = NULL; assert(am->handle != NULL);
snd_mixer_close(am->handle);
} }
static bool static bool
@ -147,8 +145,7 @@ alsa_mixer_get_volume(struct mixer *mixer)
int ret; int ret;
long level; long level;
if (am->handle == NULL && !alsa_mixer_open(mixer)) assert(am->handle != NULL);
return -1;
err = snd_mixer_handle_events(am->handle); err = snd_mixer_handle_events(am->handle);
if (err < 0) { if (err < 0) {
@ -186,8 +183,7 @@ alsa_mixer_set_volume(struct mixer *mixer, unsigned volume)
long level; long level;
int err; int err;
if (am->handle == NULL && !alsa_mixer_open(mixer)) assert(am->handle != NULL);
return false;
vol = volume; vol = volume;