queue_print, dbUtils: use struct locate_item_list

Changed the function prototypes to get locate_item_list objects
instead of num_items/items.
This commit is contained in:
Max Kellermann
2009-01-24 15:56:34 +01:00
parent ba7c996266
commit 6a2118d04c
7 changed files with 58 additions and 74 deletions

View File

@@ -81,19 +81,20 @@ queue_print_changes_position(struct client *client, const struct queue *queue,
void
queue_search(struct client *client, const struct queue *queue,
unsigned num_items, const struct locate_item *items)
const struct locate_item_list *criteria)
{
unsigned i;
struct locate_item_list *new_list = locate_item_list_new(num_items);
struct locate_item_list *new_list =
locate_item_list_new(criteria->length);
for (i = 0; i < num_items; i++)
for (i = 0; i < criteria->length; i++)
new_list->items[i].needle =
g_utf8_casefold(items[i].needle, -1);
g_utf8_casefold(criteria->items[i].needle, -1);
for (i = 0; i < queue_length(queue); i++) {
const struct song *song = queue_get(queue, i);
if (locate_song_search(song, num_items, new_list->items))
if (locate_song_search(song, new_list))
queue_print_song_info(client, queue, i);
}
@@ -102,12 +103,12 @@ queue_search(struct client *client, const struct queue *queue,
void
queue_find(struct client *client, const struct queue *queue,
unsigned num_items, const struct locate_item *items)
const struct locate_item_list *criteria)
{
for (unsigned i = 0; i < queue_length(queue); i++) {
const struct song *song = queue_get(queue, i);
if (locate_song_match(song, num_items, items))
if (locate_song_match(song, criteria))
queue_print_song_info(client, queue, i);
}
}