diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-06-18 23:44:26 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-06-18 23:44:26 +0200 |
| commit | c2fa11e179eb65b09eb1a7629f01d97fe44273aa (patch) | |
| tree | f87068c0791bb11c51f95e8ab66a876e81a72c47 /src/modules/module-zeroconf-discover.c | |
| parent | 132e73b2efbda60919db355d6baa3d9687103e0f (diff) | |
make user of pa_channel_map_init_extend() wherever it makes sense
Diffstat (limited to 'src/modules/module-zeroconf-discover.c')
| -rw-r--r-- | src/modules/module-zeroconf-discover.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c index c4057739..2fc81370 100644 --- a/src/modules/module-zeroconf-discover.c +++ b/src/modules/module-zeroconf-discover.c @@ -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); |