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/module-zeroconf-discover.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/module-zeroconf-discover.c')
| -rw-r--r-- | src/modules/module-zeroconf-discover.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c index 061560c8..4e76f448 100644 --- a/src/modules/module-zeroconf-discover.c +++ b/src/modules/module-zeroconf-discover.c @@ -164,6 +164,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); for (l = txt; l; l = l->next) { @@ -189,8 +190,10 @@ static void resolver_cb( avahi_free(value); } - if (!channel_map_set && cm.channels != ss.channels) + 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 (!pa_sample_spec_valid(&ss)) { pa_log("Service '%s' contains an invalid sample specification.", name); |