summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2020-10-04 13:18:16 +0300
committerArun Raghavan <arun@arunraghavan.net>2020-10-30 16:55:39 +0000
commitdaf3a3c4b08c89aa658353764c5237f0a4bef9f7 (patch)
treea32e1a12ac5116f929f02a22d58cdd75739ee043
parenteee8292ae13dd6f2310153dff9163875f97b2aec (diff)
alsa-mixer: Fix jack name comparisonv13.99.3
HDMI jacks are configured like this: [Jack HDMI/DP] append-pcm-to-name = yes The pa_alsa_jack.name field is then "HDMI/DP" and pa_alsa_jack.alsa_name is set to "HDMI/DP,pcm=3 Jack" or similar. If we compare the name fields of HDMI paths, they appear to use the same jack element even though they are different in reality, so all HDMI ports got incorrectly assigned to the same availability group.
-rw-r--r--src/modules/alsa/alsa-mixer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 345132f57..063179052 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -4311,7 +4311,7 @@ static void profile_set_set_availability_groups(pa_alsa_profile_set *ps) {
PA_LLIST_FOREACH(j2, p2->jacks) {
if (!j2->has_control || j2->state_plugged == PA_AVAILABLE_NO)
continue;
- if (pa_streq(j->name, j2->name)) {
+ if (pa_streq(j->alsa_name, j2->alsa_name)) {
j->state_plugged = PA_AVAILABLE_UNKNOWN;
j2->state_plugged = PA_AVAILABLE_UNKNOWN;
found = p2->availability_group;