oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

locate: add a per-item "fold_case" flag

Browse Source 
Merge locate_song_search() and locate_song_match().
This commit is contained in:
Max Kellermann
2012-08-07 23:59:17 +02:00
parent 860e9eb8c9
commit 0823711106
13 changed files with 59 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/DatabaseQueue.cxx
View File

@@ -61,7 +61,7 @@ MatchAddSong(struct player_control *pc,
const struct locate_item_list *criteria,
song &song, GError **error_r)
{
return !locate_song_match(&song, criteria) ||
return !locate_list_song_match(&song, criteria) ||
AddToQueue(pc, song, error_r);
}
@@ -75,24 +75,3 @@ findAddIn(struct player_control *pc, const char *uri,
const auto f = std::bind(MatchAddSong, pc, criteria, _1, _2);
return GetDatabase()->Visit(selection, f, error_r);
}
static bool
SearchAddSong(struct player_control *pc,
const struct locate_item_list *criteria,
song &song, GError **error_r)
{
return !locate_song_search(&song, criteria) ||
AddToQueue(pc, song, error_r);
}
bool
search_add_songs(struct player_control *pc, const char *uri,
const struct locate_item_list *criteria,
GError **error_r)
{
const DatabaseSelection selection(uri, true);
using namespace std::placeholders;
const auto f = std::bind(SearchAddSong, pc, criteria, _1, _2);
return GetDatabase()->Visit(selection, f, error_r);
}