diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-10-28 19:13:50 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-10-28 19:13:50 +0000 |
| commit | a67c21f093202f142438689d3f7cfbdf4ea82eea (patch) | |
| tree | 5c3295037f033904bc11ab8b3adae5b7331101e9 /src/pulsecore/modargs.h | |
| parent | 6687dd013169fd8436aa1b45ccdacff074a40d05 (diff) | |
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/modargs.h')
| -rw-r--r-- | src/pulsecore/modargs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulsecore/modargs.h b/src/pulsecore/modargs.h index 77262e1e..aa175885 100644 --- a/src/pulsecore/modargs.h +++ b/src/pulsecore/modargs.h @@ -49,8 +49,8 @@ int pa_modargs_get_value_boolean(pa_modargs *ma, const char *key, int *value); /* Return sample spec data from the three arguments "rate", "format" and "channels" */ int pa_modargs_get_sample_spec(pa_modargs *ma, pa_sample_spec *ss); -/* Return channel map data from the argument "channel_map" */ -int pa_modargs_get_channel_map(pa_modargs *ma, pa_channel_map *map); +/* Return channel map data from the argument "channel_map" if name is NULL, otherwise read from the specified argument */ +int pa_modargs_get_channel_map(pa_modargs *ma, const char *name, pa_channel_map *map); /* Combination of pa_modargs_get_sample_spec() and pa_modargs_get_channel_map(). Not always suitable, since this routine |