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
60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
From 156bd7742490d68701688572ec06f2c608f33db6 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Tue, 3 Dec 2019 14:52:08 +0100
|
|
Subject: [PATCH] alsa-ucm: split correctly JackHWMute device names
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/modules/alsa/alsa-ucm.c | 28 +++++++++++++++++++++++++++-
|
|
1 file changed, 27 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
|
|
index 46d016541ddf..65b786caf95e 100644
|
|
--- a/src/modules/alsa/alsa-ucm.c
|
|
+++ b/src/modules/alsa/alsa-ucm.c
|
|
@@ -200,6 +200,32 @@ static void ucm_add_devices_to_idxset(
|
|
}
|
|
}
|
|
|
|
+/* Split a string into words. Like pa_split_spaces() but handle '' and "". */
|
|
+static char *ucm_split_devnames(const char *c, const char **state) {
|
|
+ const char *current = *state ? *state : c;
|
|
+ char h;
|
|
+ size_t l;
|
|
+
|
|
+ if (!*current || *c == 0)
|
|
+ return NULL;
|
|
+
|
|
+ current += strspn(current, "\n\r \t");
|
|
+ h = *current;
|
|
+ if (h == '\'' || h =='"') {
|
|
+ c = ++current;
|
|
+ for (l = 0; *c && *c != h; l++) c++;
|
|
+ if (*c != h)
|
|
+ return NULL;
|
|
+ *state = c + 1;
|
|
+ } else {
|
|
+ l = strcspn(current, "\n\r \t");
|
|
+ *state = current+l;
|
|
+ }
|
|
+
|
|
+ return pa_xstrndup(current, l);
|
|
+}
|
|
+
|
|
+
|
|
static void ucm_volume_free(pa_alsa_ucm_volume *vol) {
|
|
pa_assert(vol);
|
|
pa_xfree(vol->mixer_elem);
|
|
@@ -1607,7 +1633,7 @@ static int ucm_create_profile(
|
|
char *hw_mute_device_name;
|
|
const char *state = NULL;
|
|
|
|
- while ((hw_mute_device_name = pa_split_spaces(jack_hw_mute, &state))) {
|
|
+ while ((hw_mute_device_name = ucm_split_devnames(jack_hw_mute, &state))) {
|
|
pa_alsa_ucm_verb *verb2;
|
|
bool device_found = false;
|
|
|
|
--
|
|
2.16.4
|
|
|