From 0c4da2bb2f4d7d3cd2cdea1369374d5b4f7e3b29 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 14 Jun 2010 22:57:45 +0200 Subject: Enumerate entities using MEDIA_ENTITY_ID_FLAG_NEXT Entity IDs don't have to be contiguous. Use the new flag-based enumeration system instead of looping over consecutive IDs. Signed-off-by: Laurent Pinchart --- main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index c946f2d..c59b633 100644 --- a/main.c +++ b/main.c @@ -63,11 +63,10 @@ static struct media_entity_pad *parse_pad(struct media_device *media, const char for (++end; isspace(*end); ++end); } else { - entity_id = strtoul(p, &end, 10) - 1; - if (entity_id >= media->entities_count) + entity_id = strtoul(p, &end, 10); + entity = media_get_entity_by_id(media, entity_id); + if (entity == NULL) return NULL; - - entity = &media->entities[entity_id]; } if (*end != ':') -- cgit v1.2.3