diff options
author | Lennart Poettering <lennart@poettering.net> | 2007-09-12 20:12:13 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2007-09-12 20:12:13 +0000 |
commit | 41378658153585c82eebca83d280b25f684e90c4 (patch) | |
tree | 6ac8f1a356571f7776c7666996643e61e890dd69 /src/pulsecore/modargs.c | |
parent | d9c4c9509d34ba89db06ff1252f3da18c6fd623b (diff) |
change pa_modargs_get_channel_map() to take an extra argument for specifying the name of the modargs attribute to parse
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1813 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/modargs.c')
-rw-r--r-- | src/pulsecore/modargs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pulsecore/modargs.c b/src/pulsecore/modargs.c index 41e80084..7ce3dd08 100644 --- a/src/pulsecore/modargs.c +++ b/src/pulsecore/modargs.c @@ -275,7 +275,7 @@ int pa_modargs_get_sample_spec(pa_modargs *ma, pa_sample_spec *rss) { return 0; } -int pa_modargs_get_channel_map(pa_modargs *ma, pa_channel_map *rmap) { +int pa_modargs_get_channel_map(pa_modargs *ma, const char *name, pa_channel_map *rmap) { pa_channel_map map; const char *cm; @@ -284,7 +284,7 @@ int pa_modargs_get_channel_map(pa_modargs *ma, pa_channel_map *rmap) { map = *rmap; - if ((cm = pa_modargs_get_value(ma, "channel_map", NULL))) + if ((cm = pa_modargs_get_value(ma, name ? name : "channel_map", NULL))) if (!pa_channel_map_parse(&map, cm)) return -1; @@ -311,7 +311,7 @@ int pa_modargs_get_sample_spec_and_channel_map(pa_modargs *ma, pa_sample_spec *r if (!pa_channel_map_init_auto(&map, ss.channels, def)) map.channels = 0; - if (pa_modargs_get_channel_map(ma, &map) < 0) + if (pa_modargs_get_channel_map(ma, NULL, &map) < 0) return -1; if (map.channels != ss.channels) |