mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

array: add and use pw_array_consume

Browse source
This commit is contained in:
Wim Taymans 2020-05-06 15:56:31 +02:00
parent 720b7b5c6a
commit 649448fb5f
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/examples/media-session/metadata.c
View file

@ -145,14 +145,8 @@ static int clear_subjects(struct metadata *this, uint32_t subject)
static void clear_items(struct metadata *this) static void clear_items(struct metadata *this)
{ {
struct item *item; struct item *item;
pw_array_consume(item, &this->metadata)
while (true) {
item = pw_array_first(&this->metadata);
if (!pw_array_check(&this->metadata, item))
break;
clear_subjects(this, item->subject); clear_subjects(this, item->subject);
}
pw_array_reset(&this->metadata); pw_array_reset(&this->metadata);
} }

5
src/pipewire/array.h
View file

@ -69,6 +69,11 @@ struct pw_array {
pw_array_check(array, pos); \ pw_array_check(array, pos); \
(pos)++) (pos)++)
#define pw_array_consume(pos, array) \
for (pos = (__typeof__(pos)) pw_array_first(array); \
pw_array_check(array, pos); \
pos = (__typeof__(pos)) pw_array_first(array))
#define pw_array_remove(a,p) \ #define pw_array_remove(a,p) \
({ \ ({ \
(a)->size -= sizeof(*(p)); \ (a)->size -= sizeof(*(p)); \