From bf487f0ffaeca7474232e5d62a3609344f8835b6 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Tue, 19 Feb 2013 13:25:48 +0100 Subject: [PATCH] alsa-mixer: Add possibility to configure ELD device The alsa mixer kcontrol has "device index" 3, 7, 8, and 9. We need to configure this properly. Signed-off-by: David Henningsson --- src/modules/alsa/alsa-mixer.c | 3 +++ src/modules/alsa/alsa-mixer.h | 1 + src/modules/alsa/mixer/paths/analog-output.conf.common | 2 ++ src/modules/alsa/mixer/paths/hdmi-output-0.conf | 1 + src/modules/alsa/mixer/paths/hdmi-output-1.conf | 1 + src/modules/alsa/mixer/paths/hdmi-output-2.conf | 1 + src/modules/alsa/mixer/paths/hdmi-output-3.conf | 1 + 7 files changed, 10 insertions(+) diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index f2e68d38..137c9ebc 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -2390,6 +2390,7 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa { "description", pa_config_parse_string, NULL, "General" }, { "name", pa_config_parse_string, NULL, "General" }, { "mute-during-activation", pa_config_parse_bool, NULL, "General" }, + { "eld-device", pa_config_parse_int, NULL, "General" }, /* [Option ...] */ { "priority", option_parse_priority, NULL, NULL }, @@ -2422,11 +2423,13 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa p->name = pa_xstrndup(n, strcspn(n, ".")); p->proplist = pa_proplist_new(); p->direction = direction; + p->eld_device = -1; items[0].data = &p->priority; items[1].data = &p->description; items[2].data = &p->name; items[3].data = &mute_during_activation; + items[4].data = &p->eld_device; if (!paths_dir) paths_dir = get_default_paths_dir(); diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h index 5b710a3a..b3f7455e 100644 --- a/src/modules/alsa/alsa-mixer.h +++ b/src/modules/alsa/alsa-mixer.h @@ -182,6 +182,7 @@ struct pa_alsa_path { char *name; char *description; unsigned priority; + int eld_device; pa_proplist *proplist; pa_bool_t probed:1; diff --git a/src/modules/alsa/mixer/paths/analog-output.conf.common b/src/modules/alsa/mixer/paths/analog-output.conf.common index 01835fbc..73d09f81 100644 --- a/src/modules/alsa/mixer/paths/analog-output.conf.common +++ b/src/modules/alsa/mixer/paths/analog-output.conf.common @@ -59,6 +59,8 @@ ; mute-during-activation = yes | no # If this path supports hardware mute, should the hw mute be used while activating this ; # path? In some cases this can reduce extra noises during port switching, while in other ; # cases this can increase such noises. Default: no. +; eld-device = ... # If this is an HDMI port, here's where to specify the device number for the ELD mixer +; # control. The default is to not make use of ELD information. ; ; [Properties] # Property list for this path. The list is merged into the port property list. ; = # Each property is defined on its own line. diff --git a/src/modules/alsa/mixer/paths/hdmi-output-0.conf b/src/modules/alsa/mixer/paths/hdmi-output-0.conf index 69b39eca..33101470 100644 --- a/src/modules/alsa/mixer/paths/hdmi-output-0.conf +++ b/src/modules/alsa/mixer/paths/hdmi-output-0.conf @@ -1,6 +1,7 @@ [General] description = HDMI / DisplayPort priority = 59 +eld-device = 3 [Properties] device.icon_name = video-display diff --git a/src/modules/alsa/mixer/paths/hdmi-output-1.conf b/src/modules/alsa/mixer/paths/hdmi-output-1.conf index 01eeeed5..d81ee789 100644 --- a/src/modules/alsa/mixer/paths/hdmi-output-1.conf +++ b/src/modules/alsa/mixer/paths/hdmi-output-1.conf @@ -1,6 +1,7 @@ [General] description = HDMI / DisplayPort 2 priority = 58 +eld-device = 7 [Properties] device.icon_name = video-display diff --git a/src/modules/alsa/mixer/paths/hdmi-output-2.conf b/src/modules/alsa/mixer/paths/hdmi-output-2.conf index 59745112..349812fc 100644 --- a/src/modules/alsa/mixer/paths/hdmi-output-2.conf +++ b/src/modules/alsa/mixer/paths/hdmi-output-2.conf @@ -1,6 +1,7 @@ [General] description = HDMI / DisplayPort 3 priority = 57 +eld-device = 8 [Properties] device.icon_name = video-display diff --git a/src/modules/alsa/mixer/paths/hdmi-output-3.conf b/src/modules/alsa/mixer/paths/hdmi-output-3.conf index 92a7acf9..81463c94 100644 --- a/src/modules/alsa/mixer/paths/hdmi-output-3.conf +++ b/src/modules/alsa/mixer/paths/hdmi-output-3.conf @@ -1,6 +1,7 @@ [General] description = HDMI / DisplayPort 4 priority = 56 +eld-device = 9 [Properties] device.icon_name = video-display -- 2.39.2