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

alsa-mixer: Add support for defining port property lists in the path configuration files.

Browse source
This commit is contained in:
Tanu Kaskinen 2012-04-13 14:48:28 +03:00 • committed by Tanu Kaskinen
parent d3bced8bee
commit 88052dbdb9
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -518,6 +518,7 @@ void pa_alsa_path_free(pa_alsa_path *p) {
setting_free(s); setting_free(s);
} }
pa_proplist_free(p->proplist);
pa_xfree(p->name); pa_xfree(p->name);
pa_xfree(p->description); pa_xfree(p->description);
pa_xfree(p); pa_xfree(p);
@ -2388,6 +2389,7 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa
p = pa_xnew0(pa_alsa_path, 1); p = pa_xnew0(pa_alsa_path, 1);
n = pa_path_get_filename(fname); n = pa_path_get_filename(fname);
p->name = pa_xstrndup(n, strcspn(n, ".")); p->name = pa_xstrndup(n, strcspn(n, "."));
p->proplist = pa_proplist_new();
p->direction = direction; p->direction = direction;
items[0].data = &p->priority; items[0].data = &p->priority;
@ -2399,7 +2401,7 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa
fn = pa_maybe_prefix_path(fname, paths_dir); fn = pa_maybe_prefix_path(fname, paths_dir);
r = pa_config_parse(fn, NULL, items, NULL, p); r = pa_config_parse(fn, NULL, items, p->proplist, p);
pa_xfree(fn); pa_xfree(fn);
if (r < 0) if (r < 0)
@ -4380,13 +4382,19 @@ static pa_device_port* device_port_alsa_init(pa_hashmap *ports,
pa_hashmap *extra, pa_hashmap *extra,
pa_core *core) { pa_core *core) {
pa_device_port * p = pa_hashmap_get(ports, name); pa_device_port *p;
pa_assert(path);
p = pa_hashmap_get(ports, name);
if (!p) { if (!p) {
pa_alsa_port_data *data; pa_alsa_port_data *data;
p = pa_device_port_new(core, name, description, sizeof(pa_alsa_port_data)); p = pa_device_port_new(core, name, description, sizeof(pa_alsa_port_data));
pa_assert(p); pa_assert(p);
pa_hashmap_put(ports, p->name, p); pa_hashmap_put(ports, p->name, p);
pa_proplist_update(p->proplist, PA_UPDATE_REPLACE, path->proplist);
data = PA_DEVICE_PORT_DATA(p); data = PA_DEVICE_PORT_DATA(p);
data->path = path; data->path = path;

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

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

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

@ -57,6 +57,10 @@
; priority = ... # Priority for this path ; priority = ... # Priority for this path
; description = ... ; description = ...
; ;
; [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.
; ...
;
; [Option ...:...] # For each option of an enumeration or switch element ; [Option ...:...] # For each option of an enumeration or switch element
; # that shall be exposed as a sink/source port. Needs to ; # that shall be exposed as a sink/source port. Needs to
; # be named after the Element, followed by a colon, followed ; # be named after the Element, followed by a colon, followed