mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-mixer: Add possibility to configure ELD device

Browse source 
The alsa mixer kcontrol has "device index" 3, 7, 8, and 9.
We need to configure this properly.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2013-02-19 13:25:48 +01:00 • committed by Tanu Kaskinen
parent eaa893d7d1
commit bf487f0ffa
7 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/alsa/alsa-mixer.c
View file

@ -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" }, { "description", pa_config_parse_string, NULL, "General" },
{ "name", pa_config_parse_string, NULL, "General" }, { "name", pa_config_parse_string, NULL, "General" },
{ "mute-during-activation", pa_config_parse_bool, NULL, "General" }, { "mute-during-activation", pa_config_parse_bool, NULL, "General" },
{ "eld-device", pa_config_parse_int, NULL, "General" },
/* [Option ...] */ /* [Option ...] */
{ "priority", option_parse_priority, NULL, NULL }, { "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->name = pa_xstrndup(n, strcspn(n, "."));
p->proplist = pa_proplist_new(); p->proplist = pa_proplist_new();
p->direction = direction; p->direction = direction;
p->eld_device = -1;
items[0].data = &p->priority; items[0].data = &p->priority;
items[1].data = &p->description; items[1].data = &p->description;
items[2].data = &p->name; items[2].data = &p->name;
items[3].data = &mute_during_activation; items[3].data = &mute_during_activation;
items[4].data = &p->eld_device;
if (!paths_dir) if (!paths_dir)
paths_dir = get_default_paths_dir(); paths_dir = get_default_paths_dir();

1
src/modules/alsa/alsa-mixer.h
View file

@ -182,6 +182,7 @@ struct pa_alsa_path {
char *name; char *name;
char *description; char *description;
unsigned priority; unsigned priority;
int eld_device;
pa_proplist *proplist; pa_proplist *proplist;
pa_bool_t probed:1; pa_bool_t probed:1;

2
src/modules/alsa/mixer/paths/analog-output.conf.common
View file

@ -59,6 +59,8 @@
; mute-during-activation = yes | no # If this path supports hardware mute, should the hw mute be used while activating this ; 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 ; # path? In some cases this can reduce extra noises during port switching, while in other
; # cases this can increase such noises. Default: no. ; # 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. ; [Properties] # Property list for this path. The list is merged into the port property list.
; <key> = <value> # Each property is defined on its own line. ; <key> = <value> # Each property is defined on its own line.

1
src/modules/alsa/mixer/paths/hdmi-output-0.conf
View file

@ -1,6 +1,7 @@
[General] [General]
description = HDMI / DisplayPort description = HDMI / DisplayPort
priority = 59 priority = 59
eld-device = 3
[Properties] [Properties]
device.icon_name = video-display device.icon_name = video-display

1
src/modules/alsa/mixer/paths/hdmi-output-1.conf
View file

@ -1,6 +1,7 @@
[General] [General]
description = HDMI / DisplayPort 2 description = HDMI / DisplayPort 2
priority = 58 priority = 58
eld-device = 7
[Properties] [Properties]
device.icon_name = video-display device.icon_name = video-display

1
src/modules/alsa/mixer/paths/hdmi-output-2.conf
View file

@ -1,6 +1,7 @@
[General] [General]
description = HDMI / DisplayPort 3 description = HDMI / DisplayPort 3
priority = 57 priority = 57
eld-device = 8
[Properties] [Properties]
device.icon_name = video-display device.icon_name = video-display

1
src/modules/alsa/mixer/paths/hdmi-output-3.conf
View file

@ -1,6 +1,7 @@
[General] [General]
description = HDMI / DisplayPort 4 description = HDMI / DisplayPort 4
priority = 56 priority = 56
eld-device = 9
[Properties] [Properties]
device.icon_name = video-display device.icon_name = video-display