mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-27 08:56:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

deal with a possibly failing pa_channel_map_init_auto() correctly

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2105 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-02-13 22:13:44 +00:00
parent a3e820fca7
commit 86b9ef8c96
13 changed files with 39 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-combine.c
View file

@ -988,8 +988,10 @@ int pa__init(pa_module*m) {
if (master_sink && ss.channels == master_sink->sample_spec.channels)
map = master_sink->channel_map;
else
else {
pa_assert_se(pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_AUX));
pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_DEFAULT);
}
if ((pa_modargs_get_channel_map(ma, NULL, &map) < 0)) {
pa_log("Invalid channel map.");