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

a few minor clean-ups

Browse source
This commit is contained in:
Lennart Poettering 2008-09-05 01:30:48 +02:00
parent 3429072504
commit b56f344b97
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pulse/channelmap.c
View file

@ -288,9 +288,6 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p
case PA_CHANNEL_MAP_AUX: { case PA_CHANNEL_MAP_AUX: {
unsigned i; unsigned i;
if (channels >= PA_CHANNELS_MAX)
return NULL;
for (i = 0; i < channels; i++) for (i = 0; i < channels; i++)
m->map[i] = PA_CHANNEL_POSITION_AUX0 + 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(rmap);
pa_assert(s); pa_assert(s);
memset(&map, 0, sizeof(map)); pa_channel_map_init(&map);
if (strcmp(s, "stereo") == 0) { if (strcmp(s, "stereo") == 0) {
map.channels = 2; 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) if (map->channels <= 0 || map->channels > PA_CHANNELS_MAX)
return 0; return 0;
for (c = 0; c < map->channels; c++) { for (c = 0; c < map->channels; c++)
if (map->map[c] < 0 || map->map[c] >= PA_CHANNEL_POSITION_MAX)
if (map->map[c] < 0 ||map->map[c] >= PA_CHANNEL_POSITION_MAX)
return 0; return 0;
}
return 1; return 1;
} }