mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-06 13:29:56 -05:00
merge r2105 from trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2159 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
b0a20498db
commit
b79c6b6bc0
13 changed files with 39 additions and 18 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue