Takashi Iwai
f9a48e9cd9
- Update to alsa-lib 1.2.2: including previous fixes - Backport recent upstream fixes: conf updates, PCM ordering fix, configure fix; 0001-conf-change-the-order-of-PCM-devices-in-alsa.conf.patch 0002-conf-namehint-add-omit_noargs-to-the-hint-section.patch 0003-Change-PCM-device-number-of-Asus-Xonar-U5.patch 0004-configure-add-embed-for-python3-config-python-3.8.patch 0005-conf-USB-Audio-Add-C-Media-USB-Headphone-Set-to-the-.patch - Drop obsoleted patches: 0001-ucm-Use-strncmp-to-avoid-access-out-of-boundary.patch 0002-ucm-return-always-at-least-NULL-if-no-list-is-availa.patch 0003-ucm-add-_identifiers-list.patch 0004-namehint-correct-the-args-check.patch 0005-namehint-improve-the-previous-patch-check-the-return.patch 0006-ucm-docs-allow-spaces-in-device-names-for-JackHWMute.patch 0007-use-case-docs-add-PlaybackMixerCopy-and-CaptureMixer.patch 0008-ucm-docs-add-JackCTL-rearrange-JackControl-and-JackD.patch 0009-ucm-Do-not-fail-to-parse-configs-on-cards-with-an-em.patch 0010-src-ucm-main.c-fix-build-without-mixer.patch 0011-alsa.m4-another-try-to-fix-the-libatopology-detectio.patch 0012-ucm-docs-add-Mic-DigitalMic-and-multiple-devices-com.patch 0013-ucm-docs-remove-DigitalMic-it-does-not-have-sense.patch 0014-ucm-docs-change-the-Mic-description-to-simple-Microp.patch 0015-ucm-docs-add-note-about-the-sequences-and-device-spl.patch 0016-ucm-docs-remove-MixerCopy-values-add-Priority-for-ve.patch 0017-ucm-setup-conf_format-after-getting-ALSA_CONFIG_UCM_.patch 0018-alsa-lib-fix-the-array-parser-unique-compound-keys.patch 0019-topology-remove-vendor_fd-name-from-snd_tplg-structu.patch 0020-topology-file-position-and-size-cleanups.patch OBS-URL: https://build.opensuse.org/request/show/784658 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=269
110 lines
3.4 KiB
Diff
110 lines
3.4 KiB
Diff
From 09e78da4cade7b8fecb8f36717b85c456f2e5487 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Sun, 1 Mar 2020 19:57:06 +0100
|
|
Subject: [PATCH 2/5] conf: namehint - add omit_noargs to the hint section
|
|
|
|
Do not list simple surround devices in the namehint function by default.
|
|
|
|
Fixes: https://github.com/alsa-project/alsa-lib/issues/27
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/conf/pcm/surround21.conf | 1 +
|
|
src/conf/pcm/surround40.conf | 1 +
|
|
src/conf/pcm/surround41.conf | 1 +
|
|
src/conf/pcm/surround50.conf | 1 +
|
|
src/conf/pcm/surround51.conf | 1 +
|
|
src/conf/pcm/surround71.conf | 1 +
|
|
src/control/namehint.c | 6 +++++-
|
|
7 files changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/conf/pcm/surround21.conf b/src/conf/pcm/surround21.conf
|
|
index 1cf1b7af8dc6..ad19507bba58 100644
|
|
--- a/src/conf/pcm/surround21.conf
|
|
+++ b/src/conf/pcm/surround21.conf
|
|
@@ -57,5 +57,6 @@ pcm.!surround21 {
|
|
hint {
|
|
description "2.1 Surround output to Front and Subwoofer speakers"
|
|
device_output $DEV
|
|
+ omit_noargs true
|
|
}
|
|
}
|
|
diff --git a/src/conf/pcm/surround40.conf b/src/conf/pcm/surround40.conf
|
|
index 9788ad4884fd..7c615022f500 100644
|
|
--- a/src/conf/pcm/surround40.conf
|
|
+++ b/src/conf/pcm/surround40.conf
|
|
@@ -55,5 +55,6 @@ pcm.!surround40 {
|
|
hint {
|
|
description "4.0 Surround output to Front and Rear speakers"
|
|
device_output $DEV
|
|
+ omit_noargs true
|
|
}
|
|
}
|
|
diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf
|
|
index 7b4ef3beb43a..cb6c0445ae07 100644
|
|
--- a/src/conf/pcm/surround41.conf
|
|
+++ b/src/conf/pcm/surround41.conf
|
|
@@ -61,5 +61,6 @@ pcm.!surround41 {
|
|
hint {
|
|
description "4.1 Surround output to Front, Rear and Subwoofer speakers"
|
|
device_output $DEV
|
|
+ omit_noargs true
|
|
}
|
|
}
|
|
diff --git a/src/conf/pcm/surround50.conf b/src/conf/pcm/surround50.conf
|
|
index 7d9a9e798fd8..70d54069f8a3 100644
|
|
--- a/src/conf/pcm/surround50.conf
|
|
+++ b/src/conf/pcm/surround50.conf
|
|
@@ -61,5 +61,6 @@ pcm.!surround50 {
|
|
hint {
|
|
description "5.0 Surround output to Front, Center and Rear speakers"
|
|
device_output $DEV
|
|
+ omit_noargs true
|
|
}
|
|
}
|
|
diff --git a/src/conf/pcm/surround51.conf b/src/conf/pcm/surround51.conf
|
|
index e67f007ef305..d0236e42d332 100644
|
|
--- a/src/conf/pcm/surround51.conf
|
|
+++ b/src/conf/pcm/surround51.conf
|
|
@@ -57,5 +57,6 @@ pcm.!surround51 {
|
|
hint {
|
|
description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers"
|
|
device_output $DEV
|
|
+ omit_noargs true
|
|
}
|
|
}
|
|
diff --git a/src/conf/pcm/surround71.conf b/src/conf/pcm/surround71.conf
|
|
index a26c3f36c437..66792ddebbc0 100644
|
|
--- a/src/conf/pcm/surround71.conf
|
|
+++ b/src/conf/pcm/surround71.conf
|
|
@@ -59,5 +59,6 @@ pcm.!surround71 {
|
|
hint {
|
|
description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers"
|
|
device_output $DEV
|
|
+ omit_noargs true
|
|
}
|
|
}
|
|
diff --git a/src/control/namehint.c b/src/control/namehint.c
|
|
index 60c48ae32877..169bd4215fc5 100644
|
|
--- a/src/control/namehint.c
|
|
+++ b/src/control/namehint.c
|
|
@@ -287,10 +287,14 @@ static int try_config(snd_config_t *config,
|
|
err = -EINVAL;
|
|
goto __cleanup;
|
|
}
|
|
+ if (list->card < 0 &&
|
|
+ snd_config_search(cfg, "omit_noargs", &n) >= 0 &&
|
|
+ snd_config_get_bool(n) > 0)
|
|
+ goto __skip_add;
|
|
if (level == 1 &&
|
|
snd_config_search(cfg, "show", &n) >= 0 &&
|
|
snd_config_get_bool(n) <= 0)
|
|
- goto __skip_add;
|
|
+ goto __skip_add;
|
|
if (buf1 == NULL &&
|
|
snd_config_search(cfg, "description", &n) >= 0 &&
|
|
snd_config_get_string(n, &str) >= 0) {
|
|
--
|
|
2.16.4
|
|
|