mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

make user of pa_channel_map_init_extend() wherever it makes sense

Browse source
This commit is contained in:
Lennart Poettering 2008-06-18 23:44:26 +02:00
parent 132e73b2ef
commit c2fa11e179
6 changed files with 9 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/module-zeroconf-discover.c
View file

@ -162,8 +162,7 @@ static void resolver_cb(
pa_module *m;
ss = u->core->default_sample_spec;
pa_assert_se(pa_channel_map_init_auto(&cm, ss.channels, PA_CHANNEL_MAP_AUX));
pa_channel_map_init_auto(&cm, ss.channels, PA_CHANNEL_MAP_DEFAULT);
pa_channel_map_init_extend(&cm, ss.channels, PA_CHANNEL_MAP_DEFAULT);
for (l = txt; l; l = l->next) {
char *key, *value;
@ -188,10 +187,8 @@ static void resolver_cb(
avahi_free(value);
}
if (!channel_map_set && cm.channels != ss.channels) {
pa_assert_se(pa_channel_map_init_auto(&cm, ss.channels, PA_CHANNEL_MAP_AUX));
pa_channel_map_init_auto(&cm, ss.channels, PA_CHANNEL_MAP_DEFAULT);
}
if (!channel_map_set && cm.channels != ss.channels)
pa_channel_map_init_extend(&cm, ss.channels, PA_CHANNEL_MAP_DEFAULT);
if (!pa_sample_spec_valid(&ss)) {
pa_log("Service '%s' contains an invalid sample specification.", name);