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

mixer/alsa: move code to alsa_mixer_lookup_elem()

Browse Source
This commit is contained in:
Max Kellermann 2012-01-05 00:52:41 +01:00
parent 9937ff8ac0
commit 1b889c527f
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/mixer/alsa_mixer_plugin.c
View File

@ -91,12 +91,28 @@ alsa_mixer_close(struct mixer *data)
snd_mixer_close(am->handle); snd_mixer_close(am->handle);
} }
G_GNUC_PURE
static snd_mixer_elem_t *
alsa_mixer_lookup_elem(snd_mixer_t *handle, const char *name, unsigned idx)
{
for (snd_mixer_elem_t *elem = snd_mixer_first_elem(handle);
elem != NULL; elem = snd_mixer_elem_next(elem)) {
if (snd_mixer_elem_get_type(elem) == SND_MIXER_ELEM_SIMPLE &&
g_ascii_strcasecmp(snd_mixer_selem_get_name(elem),
name) == 0 &&
snd_mixer_selem_get_index(elem) == idx)
return elem;
}
return NULL;
}
static bool static bool
alsa_mixer_open(struct mixer *data, GError **error_r) alsa_mixer_open(struct mixer *data, GError **error_r)
{ {
struct alsa_mixer *am = (struct alsa_mixer *)data; struct alsa_mixer *am = (struct alsa_mixer *)data;
int err; int err;
snd_mixer_elem_t *elem;
am->volume_set = -1; am->volume_set = -1;
@ -132,31 +148,18 @@ alsa_mixer_open(struct mixer *data, GError **error_r)
return false; return false;
} }
elem = snd_mixer_first_elem(am->handle); am->elem = alsa_mixer_lookup_elem(am->handle, am->control, am->index);
if (am->elem == NULL) {
while (elem) { alsa_mixer_close(data);
if (snd_mixer_elem_get_type(elem) == SND_MIXER_ELEM_SIMPLE) { g_set_error(error_r, alsa_mixer_quark(), 0,
if ((g_ascii_strcasecmp(am->control, "no such mixer control: %s", am->control);
snd_mixer_selem_get_name(elem)) == 0) && return false;
(am->index == snd_mixer_selem_get_index(elem))) {
break;
}
}
elem = snd_mixer_elem_next(elem);
} }
if (elem) { snd_mixer_selem_get_playback_volume_range(am->elem,
am->elem = elem; &am->volume_min,
snd_mixer_selem_get_playback_volume_range(am->elem, &am->volume_max);
&am->volume_min, return true;
&am->volume_max);
return true;
}
alsa_mixer_close(data);
g_set_error(error_r, alsa_mixer_quark(), 0,
"no such mixer control: %s", am->control);
return false;
} }
static int static int