diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-09-05 01:30:48 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-09-05 01:30:48 +0200 |
commit | b56f344b97e9520828a76cf54d81663fa48cbd33 (patch) | |
tree | 70e206254ef350215052c0744f8852c5994c4713 /src/pulse | |
parent | 34290725043274ddc88aeb203892f3d8bb7bbecf (diff) |
a few minor clean-ups
Diffstat (limited to 'src/pulse')
-rw-r--r-- | src/pulse/channelmap.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c index 7df6d6df..37308751 100644 --- a/src/pulse/channelmap.c +++ b/src/pulse/channelmap.c @@ -288,9 +288,6 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p case PA_CHANNEL_MAP_AUX: { unsigned i; - if (channels >= PA_CHANNELS_MAX) - return NULL; - for (i = 0; i < channels; i++) m->map[i] = PA_CHANNEL_POSITION_AUX0 + i; @@ -491,7 +488,7 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *rmap, const char *s) { pa_assert(rmap); pa_assert(s); - memset(&map, 0, sizeof(map)); + pa_channel_map_init(&map); if (strcmp(s, "stereo") == 0) { map.channels = 2; @@ -554,11 +551,9 @@ int pa_channel_map_valid(const pa_channel_map *map) { if (map->channels <= 0 || map->channels > PA_CHANNELS_MAX) return 0; - for (c = 0; c < map->channels; c++) { - - if (map->map[c] < 0 ||map->map[c] >= PA_CHANNEL_POSITION_MAX) + for (c = 0; c < map->channels; c++) + if (map->map[c] < 0 || map->map[c] >= PA_CHANNEL_POSITION_MAX) return 0; - } return 1; } |