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

clean up some more array iterations

Browse source
This commit is contained in:
Wim Taymans 2022-09-30 17:23:05 +02:00
parent 0b98614bea
commit 9b6e504c19
14 changed files with 88 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/modules/module-protocol-pulse/format.c
View file

@ -159,32 +159,28 @@ uint32_t format_name2id(const char *name)
uint32_t format_paname2id(const char *name, size_t size)
{
size_t i;
for (i = 0; i < SPA_N_ELEMENTS(audio_formats); i++) {
if (audio_formats[i].name != NULL &&
strncmp(name, audio_formats[i].name, size) == 0)
return audio_formats[i].id;
SPA_FOR_EACH_ELEMENT_VAR(audio_formats, f) {
if (f->name != NULL &&
strncmp(name, f->name, size) == 0)
return f->id;
}
return SPA_AUDIO_FORMAT_UNKNOWN;
}
enum sample_format format_id2pa(uint32_t id)
{
size_t i;
for (i = 0; i < SPA_N_ELEMENTS(audio_formats); i++) {
if (id == audio_formats[i].id)
return audio_formats[i].pa;
SPA_FOR_EACH_ELEMENT_VAR(audio_formats, f) {
if (id == f->id)
return f->pa;
}
return SAMPLE_INVALID;
}
const char *format_id2paname(uint32_t id)
{
size_t i;
for (i = 0; i < SPA_N_ELEMENTS(audio_formats); i++) {
if (id == audio_formats[i].id &&
audio_formats[i].name != NULL)
return audio_formats[i].name;
SPA_FOR_EACH_ELEMENT_VAR(audio_formats, f) {
if (id == f->id && f->name != NULL)
return f->name;
}
return "invalid";
}
@ -266,21 +262,18 @@ enum channel_position channel_id2pa(uint32_t id, uint32_t *aux)
const char *channel_id2paname(uint32_t id, uint32_t *aux)
{
size_t i;
for (i = 0; i < SPA_N_ELEMENTS(audio_channels); i++) {
if (id == audio_channels[i].channel &&
audio_channels[i].name != NULL)
return audio_channels[i].name;
SPA_FOR_EACH_ELEMENT_VAR(audio_channels, i) {
if (id == i->channel && i->name != NULL)
return i->name;
}
return audio_channels[CHANNEL_POSITION_AUX0 + ((*aux)++ & 31)].name;
}
uint32_t channel_paname2id(const char *name, size_t size)
{
size_t i;
for (i = 0; i < SPA_N_ELEMENTS(audio_channels); i++) {
if (strncmp(name, audio_channels[i].name, size) == 0)
return audio_channels[i].channel;
SPA_FOR_EACH_ELEMENT_VAR(audio_channels, i) {
if (strncmp(name, i->name, size) == 0)
return i->channel;
}
return SPA_AUDIO_CHANNEL_UNKNOWN;
}

9
src/modules/module-protocol-pulse/manager.c
View file

@ -553,11 +553,10 @@ static const struct object_info *objects[] =
static const struct object_info *find_info(const char *type, uint32_t version)
{
size_t i;
for (i = 0; i < SPA_N_ELEMENTS(objects); i++) {
if (spa_streq(objects[i]->type, type) &&
objects[i]->version <= version)
return objects[i];
SPA_FOR_EACH_ELEMENT_VAR(objects, i) {
if (spa_streq((*i)->type, type) &&
(*i)->version <= version)
return *i;
}
return NULL;
}

7
src/modules/module-protocol-pulse/quirks.c
View file

@ -38,10 +38,9 @@ static uint64_t parse_quirks(const char *str)
{ "force-s16-info", QUIRK_FORCE_S16_FORMAT },
{ "remove-capture-dont-move", QUIRK_REMOVE_CAPTURE_DONT_MOVE },
};
size_t i;
for (i = 0; i < SPA_N_ELEMENTS(quirk_keys); ++i) {
if (spa_streq(str, quirk_keys[i].key))
return quirk_keys[i].value;
SPA_FOR_EACH_ELEMENT_VAR(quirk_keys, i) {
if (spa_streq(str, i->key))
return i->value;
}
return 0;
}