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
85 lines
2.8 KiB
Diff
85 lines
2.8 KiB
Diff
From d8200ee805ed6b508a8174031080b1d98a7c27b3 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 6 Dec 2019 16:05:07 +0100
|
|
Subject: [PATCH] alsa-util: do not try to guess the mixer name from the PCM
|
|
name
|
|
|
|
This is just invalid. It results to an error in almost all cases.
|
|
The hw:<number> scheme is sufficient to get the right card mixer.
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/modules/alsa/alsa-ucm.c | 2 ++
|
|
src/modules/alsa/alsa-util.c | 26 +++++++-------------------
|
|
2 files changed, 9 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
|
|
index 95f1a47f8b61..45eb83085b38 100644
|
|
--- a/src/modules/alsa/alsa-ucm.c
|
|
+++ b/src/modules/alsa/alsa-ucm.c
|
|
@@ -1725,6 +1725,8 @@ static void ucm_mapping_jack_probe(pa_alsa_mapping *m) {
|
|
PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) {
|
|
bool has_control;
|
|
|
|
+ if (!dev->jack)
|
|
+ continue;
|
|
has_control = pa_alsa_mixer_find(mixer_handle, dev->jack->alsa_name, 0) != NULL;
|
|
pa_alsa_jack_set_has_control(dev->jack, has_control);
|
|
pa_log_info("UCM jack %s has_control=%d", dev->jack->name, dev->jack->has_control);
|
|
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
|
|
index a14b061118e6..54fe1361148a 100644
|
|
--- a/src/modules/alsa/alsa-util.c
|
|
+++ b/src/modules/alsa/alsa-util.c
|
|
@@ -1743,7 +1743,6 @@ snd_mixer_t *pa_alsa_open_mixer(int alsa_card_index, char **ctl_device) {
|
|
snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device) {
|
|
int err;
|
|
snd_mixer_t *m;
|
|
- const char *dev;
|
|
snd_pcm_info_t* info;
|
|
snd_pcm_info_alloca(&info);
|
|
|
|
@@ -1754,15 +1753,6 @@ snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device) {
|
|
return NULL;
|
|
}
|
|
|
|
- /* First, try by name */
|
|
- if ((dev = snd_pcm_name(pcm)))
|
|
- if (prepare_mixer(m, dev) >= 0) {
|
|
- if (ctl_device)
|
|
- *ctl_device = pa_xstrdup(dev);
|
|
-
|
|
- return m;
|
|
- }
|
|
-
|
|
/* Then, try by card index */
|
|
if (snd_pcm_info(pcm, info) >= 0) {
|
|
char *md;
|
|
@@ -1771,17 +1761,15 @@ snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device) {
|
|
if ((card_idx = snd_pcm_info_get_card(info)) >= 0) {
|
|
|
|
md = pa_sprintf_malloc("hw:%i", card_idx);
|
|
+ if (prepare_mixer(m, md) >= 0) {
|
|
|
|
- if (!dev || !pa_streq(dev, md))
|
|
- if (prepare_mixer(m, md) >= 0) {
|
|
+ if (ctl_device)
|
|
+ *ctl_device = md;
|
|
+ else
|
|
+ pa_xfree(md);
|
|
|
|
- if (ctl_device)
|
|
- *ctl_device = md;
|
|
- else
|
|
- pa_xfree(md);
|
|
-
|
|
- return m;
|
|
- }
|
|
+ return m;
|
|
+ }
|
|
|
|
pa_xfree(md);
|
|
}
|
|
--
|
|
2.16.4
|
|
|