From febc9b6120a8b3fd0990ddd72f810c13f6f4ed81 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 27 Oct 2004 09:21:25 +0000 Subject: [PATCH] ext/alsa/gstalsamixer.c: Don't break on options (fixes #156488). Original commit message from CVS: * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list): Don't break on options (fixes #156488). --- ChangeLog | 5 +++++ ext/alsa/gstalsamixer.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 322b552..1022039 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-27 Ronald S. Bultje + + * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list): + Don't break on options (fixes #156488). + 2004-10-27 Thomas Vander Stichele * configure.ac: diff --git a/ext/alsa/gstalsamixer.c b/ext/alsa/gstalsamixer.c index 926e555..8b4bf47 100644 --- a/ext/alsa/gstalsamixer.c +++ b/ext/alsa/gstalsamixer.c @@ -280,9 +280,15 @@ gst_alsa_mixer_build_list (GstAlsaMixer * mixer) /* prevent dup names */ for (item = mixer->tracklist; item != NULL; item = item->next) { + snd_mixer_elem_t *temp; + + if (GST_IS_ALSA_MIXER_OPTIONS (item->data)) + temp = GST_ALSA_MIXER_OPTIONS (item->data)->element; + else + temp = GST_ALSA_MIXER_TRACK (item->data)->element; + if (!strcmp (snd_mixer_selem_get_name (element), - snd_mixer_selem_get_name (GST_ALSA_MIXER_TRACK (item->data)-> - element))) + snd_mixer_selem_get_name (element))) samename++; } -- 2.7.4