mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

core-format: Add pa_format_info_get_channel_map()

Browse source
This commit is contained in:
Tanu Kaskinen 2013-11-25 14:59:44 +02:00
parent 066dd942aa
commit 3a5a0f6652
3 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pulse/format.c
View file

@ -218,7 +218,6 @@ pa_format_info* pa_format_info_from_sample_spec(pa_sample_spec *ss, pa_channel_m
/* For PCM streams */
int pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_channel_map *map) {
char *m = NULL;
int ret = -PA_ERR_INVALID;
pa_assert(f);
@ -233,21 +232,12 @@ int pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_chan
goto out;
if (pa_format_info_get_channels(f, &ss->channels) < 0)
goto out;
if (map) {
pa_channel_map_init(map);
if (pa_format_info_get_prop_string(f, PA_PROP_FORMAT_CHANNEL_MAP, &m) == 0)
if (pa_channel_map_parse(map, m) == NULL)
goto out;
}
if (map && pa_format_info_get_channel_map(f, map) < 0)
goto out;
ret = 0;
out:
if (m)
pa_xfree(m);
return ret;
}