From 0823711106912fc75f1bdb2461243b12ba670f8b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 7 Aug 2012 23:59:17 +0200 Subject: locate: add a per-item "fold_case" flag Merge locate_song_search() and locate_song_match(). --- src/DatabaseCommands.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/DatabaseCommands.cxx') diff --git a/src/DatabaseCommands.cxx b/src/DatabaseCommands.cxx index 913e338d..f54f0498 100644 --- a/src/DatabaseCommands.cxx +++ b/src/DatabaseCommands.cxx @@ -110,7 +110,7 @@ handle_search(struct client *client, int argc, char *argv[]) } GError *error = NULL; - enum command_return ret = searchForSongsIn(client, "", list, &error) + enum command_return ret = findSongsIn(client, "", list, &error) ? COMMAND_RETURN_OK : print_error(client, error); @@ -131,8 +131,8 @@ handle_searchadd(struct client *client, int argc, char *argv[]) } GError *error = NULL; - enum command_return ret = search_add_songs(client->player_control, - "", list, &error) + enum command_return ret = + findAddIn(client->player_control, "", list, &error) ? COMMAND_RETURN_OK : print_error(client, error); @@ -205,9 +205,9 @@ enum command_return handle_list(struct client *client, int argc, char *argv[]) { struct locate_item_list *conditionals; - int tagType = locate_parse_type(argv[1]); + unsigned tagType = locate_parse_type(argv[1]); - if (tagType < 0) { + if (tagType == TAG_NUM_OF_ITEM_TYPES) { command_error(client, ACK_ERROR_ARG, "\"%s\" is not known", argv[1]); return COMMAND_RETURN_ERROR; } -- cgit v1.2.3