diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-05-16 23:47:38 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-05-16 23:47:38 +0000 |
| commit | 4b6ab291a787ff597c938842b569a35434ab11d8 (patch) | |
| tree | 2cecfeceebbb509ed2f32d94c0f489ed3c5654bb /src/polypcore/modargs.c | |
| parent | c63cc7bb79fb60b6493c3e80648501fbe8a83963 (diff) | |
* modify pa_channel_map_init_auto() to take an extra argument specifying the standard to use (ALSA, AIFF, ...)
* add some more validity checks to pa_source_new(),pa_sink_new(),pa_sink_input_new(),pa_source_output_new()
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@888 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/polypcore/modargs.c')
| -rw-r--r-- | src/polypcore/modargs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/polypcore/modargs.c b/src/polypcore/modargs.c index 6a02df0a..713326bf 100644 --- a/src/polypcore/modargs.c +++ b/src/polypcore/modargs.c @@ -280,7 +280,7 @@ int pa_modargs_get_channel_map(pa_modargs *ma, pa_channel_map *rmap) { return 0; } -int pa_modargs_get_sample_spec_and_channel_map(pa_modargs *ma, pa_sample_spec *rss, pa_channel_map *rmap) { +int pa_modargs_get_sample_spec_and_channel_map(pa_modargs *ma, pa_sample_spec *rss, pa_channel_map *rmap, pa_channel_map_def_t def) { pa_sample_spec ss; pa_channel_map map; @@ -293,7 +293,8 @@ int pa_modargs_get_sample_spec_and_channel_map(pa_modargs *ma, pa_sample_spec *r if (pa_modargs_get_sample_spec(ma, &ss) < 0) return -1; - pa_channel_map_init_auto(&map, ss.channels); + if (!pa_channel_map_init_auto(&map, ss.channels, def)) + map.channels = 0; if (pa_modargs_get_channel_map(ma, &map) < 0) return -1; |