From 0cfe57f33d4a6e511577614e97c7491e6450f0eb Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 14 Feb 2024 15:54:20 +0000 Subject: [PATCH] Add SOC-style jack names to HDMI audio paths Currently the HDMI output paths have jack mixers named "HDMI/DP" and with append-pcm-to-name=true. However, most of the SOC audio drivers are just named "HDMI" and don't add the ",pcm=N". Add these alternate jack names to the HDMI audio path files so that jack detection will work on these SOCs. --- spa/plugins/alsa/mixer/paths/hdmi-output-0.conf | 4 ++++ spa/plugins/alsa/mixer/paths/hdmi-output-1.conf | 4 ++++ spa/plugins/alsa/mixer/paths/hdmi-output-10.conf | 4 ++++ spa/plugins/alsa/mixer/paths/hdmi-output-2.conf | 4 ++++ spa/plugins/alsa/mixer/paths/hdmi-output-3.conf | 4 ++++ spa/plugins/alsa/mixer/paths/hdmi-output-4.conf | 4 ++++ spa/plugins/alsa/mixer/paths/hdmi-output-5.conf | 4 ++++ spa/plugins/alsa/mixer/paths/hdmi-output-6.conf | 4 ++++ spa/plugins/alsa/mixer/paths/hdmi-output-7.conf | 4 ++++ spa/plugins/alsa/mixer/paths/hdmi-output-8.conf | 4 ++++ spa/plugins/alsa/mixer/paths/hdmi-output-9.conf | 4 ++++ 11 files changed, 44 insertions(+) diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-0.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-0.conf index bb3cec1f9..3f5b7d6e3 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-0.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-0.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-1.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-1.conf index 3389a728b..dd89bd254 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-1.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-1.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-10.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-10.conf index 7607f8f26..c734976dc 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-10.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-10.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-2.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-2.conf index 316d8102f..85b7cfdc8 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-2.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-2.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-3.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-3.conf index 0601ef7bd..89da0ee06 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-3.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-3.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-4.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-4.conf index ded155b0a..76f4f1dd1 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-4.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-4.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-5.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-5.conf index de31791b8..b93daa997 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-5.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-5.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-6.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-6.conf index 6d72176cc..1b6086ecf 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-6.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-6.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-7.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-7.conf index d5d077139..6ebf80b58 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-7.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-7.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-8.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-8.conf index 0b8f9cdd1..ae53e7981 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-8.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-8.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore diff --git a/spa/plugins/alsa/mixer/paths/hdmi-output-9.conf b/spa/plugins/alsa/mixer/paths/hdmi-output-9.conf index f15797c9f..35aa99167 100644 --- a/spa/plugins/alsa/mixer/paths/hdmi-output-9.conf +++ b/spa/plugins/alsa/mixer/paths/hdmi-output-9.conf @@ -10,3 +10,7 @@ device.icon_name = video-display [Jack HDMI/DP] append-pcm-to-name = yes required = ignore + +[Jack HDMI] +append-pcm-to-name = no +required = ignore