forked from pool/alsa-utils
Takashi Iwai
3353140a95
- Backport upstream fixes, including the fix for alsa-info (boo#928394): 0001-amixer-Don-t-set-only-the-first-item-in-sset_enum.patch 0002-amixer-expand-local-storage-for-item-name-according-.patch 0003-alsa-info-Don-t-try-update-when-wget-isn-t-available.patch OBS-URL: https://build.opensuse.org/request/show/304257 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=116
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 1a19ec15385033b59ebfffec954034680575a003 Mon Sep 17 00:00:00 2001
|
|
From: Peter Meerwald <p.meerwald@bct-electronic.com>
|
|
Date: Tue, 3 Mar 2015 18:39:52 +0100
|
|
Subject: [PATCH 1/3] amixer: Don't set only the first item in sset_enum()
|
|
|
|
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
amixer/amixer.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/amixer/amixer.c b/amixer/amixer.c
|
|
index ed60e7c3a960..36c92eb99bc9 100644
|
|
--- a/amixer/amixer.c
|
|
+++ b/amixer/amixer.c
|
|
@@ -1278,7 +1278,7 @@ static int get_enum_item_index(snd_mixer_elem_t *elem, char **ptrp)
|
|
|
|
static int sset_enum(snd_mixer_elem_t *elem, unsigned int argc, char **argv)
|
|
{
|
|
- unsigned int idx, chn = 0;
|
|
+ unsigned int idx, item = 0;
|
|
int check_flag = ignore_error ? 0 : -1;
|
|
|
|
for (idx = 1; idx < argc; idx++) {
|
|
@@ -1287,7 +1287,7 @@ static int sset_enum(snd_mixer_elem_t *elem, unsigned int argc, char **argv)
|
|
int ival = get_enum_item_index(elem, &ptr);
|
|
if (ival < 0)
|
|
return check_flag;
|
|
- if (snd_mixer_selem_set_enum_item(elem, chn, ival) >= 0)
|
|
+ if (snd_mixer_selem_set_enum_item(elem, item++, ival) >= 0)
|
|
check_flag = 1;
|
|
/* skip separators */
|
|
while (*ptr == ',' || isspace(*ptr))
|
|
--
|
|
2.3.5
|
|
|