Takashi Iwai
5dabf3bcba
- Backport upstream fixes / enhancements about alsa modules: mainly for UCM support (boo#1160914): 0001-alsa-mixer-path-test-Hide-unused-functions-when-buil.patch 0002-alsa-mixer-recognize-the-Speaker-Jack-control.patch 0003-alsa-mixer-add-support-for-SteelSeries-Arctis-Pro-20.patch 0004-alsa-mixer-Add-support-for-SteelSeries-Arctis-5-2019.patch 0005-alsa-mixer-add-support-for-LucidSound-LS31-and-creat.patch 0006-alsa-ucm-use-ucm2-name-for-the-direct-card-index-ope.patch 0007-alsa-ucm-add-mixer-IDs-to-ucm_items.patch 0008-alsa-mixer-handle-the-index-for-ALSA-mixer-element-i.patch 0009-alsa-mixer-improve-alsa_id_decode-function.patch 0010-alsa-ucm-Support-Playback-CaptureVolume.patch 0011-alsa-ucm-Fix-volume-control-based-on-review.patch 0012-alsa-ucm-use-the-correct-mixer-identifiers-as-first.patch 0013-alsa-ucm-add-support-for-master-volume.patch 0014-alsa-ucm-split-correctly-JackHWMute-device-names.patch 0015-alsa-ucm-fix-parsing-for-JackControl.patch 0016-alsa-ucm-add-comments-to-ucm_get_mixer_id.patch 0017-alsa-ucm-validate-access-to-PA_DEVICE_PORT_DATA.patch 0018-alsa-Skip-resume-PCM-if-hardware-doesn-t-support-it.patch 0019-alsa-ucm-parse-correctly-the-device-values.patch 0020-alsa-ucm-do-not-try-to-use-UCM-device-name-as-jack-n.patch 0021-alsa-util-do-not-try-to-guess-the-mixer-name-from-th.patch 0022-alsa-ucm-add-control-and-mixer-device-items.patch 0023-alsa-ucm-get-the-mixer-names-from-ucm-don-t-guess.patch 0024-alsa-ucm-use-the-proper-mixer-name-for-ucm-pcm-sink-.patch 0025-alsa-mixer-handle-interface-type-CARD-PCM-for-mixer-.patch 0026-alsa-mixer-Add-the-ability-to-pass-the-intended-role.patch 0027-alsa-mixer-Set-the-intended-role-of-Steelseries-Arct.patch 0028-alsa-rewrite-mixer-open-close-cache-mixer-accesses-i.patch OBS-URL: https://build.opensuse.org/request/show/774841 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=217
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From c8f065250dde966825f171ff817f7301f423a42e Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Sat, 23 Nov 2019 15:17:30 +0100
|
|
Subject: [PATCH] alsa-ucm: use ucm2 name for the direct card index open
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/modules/alsa/alsa-ucm.c | 28 ++++++++++++++++++----------
|
|
1 file changed, 18 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
|
|
index 0a40ca8fe654..aeb4e59e323c 100644
|
|
--- a/src/modules/alsa/alsa-ucm.c
|
|
+++ b/src/modules/alsa/alsa-ucm.c
|
|
@@ -576,17 +576,25 @@ int pa_alsa_ucm_query_profiles(pa_alsa_ucm_config *ucm, int card_index) {
|
|
const char **verb_list;
|
|
int num_verbs, i, err = 0;
|
|
|
|
- /* is UCM available for this card ? */
|
|
- err = snd_card_get_name(card_index, &card_name);
|
|
- if (err < 0) {
|
|
- pa_log("Card can't get card_name from card_index %d", card_index);
|
|
- goto name_fail;
|
|
- }
|
|
-
|
|
+ /* support multiple card instances, address card directly by index */
|
|
+ card_name = pa_sprintf_malloc("hw:%i", card_index);
|
|
+ if (card_name == NULL)
|
|
+ return -ENOMEM;
|
|
err = snd_use_case_mgr_open(&ucm->ucm_mgr, card_name);
|
|
if (err < 0) {
|
|
- pa_log_info("UCM not available for card %s", card_name);
|
|
- goto ucm_mgr_fail;
|
|
+ /* fallback longname: is UCM available for this card ? */
|
|
+ pa_xfree(card_name);
|
|
+ err = snd_card_get_name(card_index, &card_name);
|
|
+ if (err < 0) {
|
|
+ pa_log("Card can't get card_name from card_index %d", card_index);
|
|
+ goto name_fail;
|
|
+ }
|
|
+
|
|
+ err = snd_use_case_mgr_open(&ucm->ucm_mgr, card_name);
|
|
+ if (err < 0) {
|
|
+ pa_log_info("UCM not available for card %s", card_name);
|
|
+ goto ucm_mgr_fail;
|
|
+ }
|
|
}
|
|
|
|
pa_log_info("UCM available for card %s", card_name);
|
|
@@ -626,7 +634,7 @@ ucm_verb_fail:
|
|
}
|
|
|
|
ucm_mgr_fail:
|
|
- free(card_name);
|
|
+ pa_xfree(card_name);
|
|
|
|
name_fail:
|
|
return err;
|
|
--
|
|
2.16.4
|
|
|