diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-02-13 22:13:44 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-02-13 22:13:44 +0000 |
commit | 86b9ef8c961bed9d3a65f044741bb423c26d8005 (patch) | |
tree | 4f588c2d88c235374ba5e3766f7e3350394f2acd /src/modules/alsa-util.c | |
parent | a3e820fca7e264037adf525a8af8894190f25ec7 (diff) |
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
Diffstat (limited to 'src/modules/alsa-util.c')
-rw-r--r-- | src/modules/alsa-util.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/alsa-util.c b/src/modules/alsa-util.c index 40170e9c..6afec3bc 100644 --- a/src/modules/alsa-util.c +++ b/src/modules/alsa-util.c @@ -615,8 +615,10 @@ snd_pcm_t *pa_alsa_open_by_device_string( *dev = d; - if (ss->channels != map->channels) + if (ss->channels != map->channels) { + 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_ALSA); + } return pcm_handle; } |