deal with a possibly failing pa_channel_map_init_auto() correctly

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

View file

@ -217,13 +217,13 @@ pa_resampler* pa_resampler_new(
if (am)
r->i_cm = *am;
else
pa_channel_map_init_auto(&r->i_cm, r->i_ss.channels, PA_CHANNEL_MAP_DEFAULT);
else if (!pa_channel_map_init_auto(&r->i_cm, r->i_ss.channels, PA_CHANNEL_MAP_DEFAULT))
goto fail;
if (bm)
r->o_cm = *bm;
else
pa_channel_map_init_auto(&r->o_cm, r->o_ss.channels, PA_CHANNEL_MAP_DEFAULT);
else if (!pa_channel_map_init_auto(&r->o_cm, r->o_ss.channels, PA_CHANNEL_MAP_DEFAULT))
goto fail;
r->i_fz = pa_frame_size(a);
r->o_fz = pa_frame_size(b);