diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-29 19:27:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-29 20:19:02 +0200 |
| commit | 333d226ed0044cf6a6387e03805be2d7f6dac6f2 (patch) | |
| tree | 7acb6fc795fcd2bb8aa75c16172de1ff7a761e8f /src/DatabasePrint.cxx | |
| parent | 04a9dec9525a58d077da71a84655cb45b7838520 (diff) | |
| download | mpd-333d226ed0044cf6a6387e03805be2d7f6dac6f2.tar.gz mpd-333d226ed0044cf6a6387e03805be2d7f6dac6f2.tar.xz mpd-333d226ed0044cf6a6387e03805be2d7f6dac6f2.zip | |
SongFilter: convert to a C++ class
Diffstat (limited to '')
| -rw-r--r-- | src/DatabasePrint.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/DatabasePrint.cxx b/src/DatabasePrint.cxx index 9ff833ffd..97ff9c12c 100644 --- a/src/DatabasePrint.cxx +++ b/src/DatabasePrint.cxx @@ -120,12 +120,12 @@ db_selection_print(struct client *client, const DatabaseSelection &selection, return false; using namespace std::placeholders; - const auto d = selection.match == nullptr + const auto d = selection.filter == nullptr ? std::bind(PrintDirectory, client, _1) : VisitDirectory(); const auto s = std::bind(full ? PrintSongFull : PrintSongBrief, client, _1); - const auto p = selection.match == nullptr + const auto p = selection.filter == nullptr ? std::bind(full ? PrintPlaylistFull : PrintPlaylistBrief, client, _1, _2) : VisitPlaylist(); @@ -155,14 +155,14 @@ stats_visitor_song(SearchStats &stats, song &song) bool searchStatsForSongsIn(struct client *client, const char *name, - const struct locate_item_list *criteria, + const SongFilter *filter, GError **error_r) { const Database *db = GetDatabase(error_r); if (db == nullptr) return false; - const DatabaseSelection selection(name, true, criteria); + const DatabaseSelection selection(name, true, filter); SearchStats stats; stats.numberOfSongs = 0; @@ -211,14 +211,14 @@ PrintUniqueTag(struct client *client, enum tag_type tag_type, bool listAllUniqueTags(struct client *client, int type, - const struct locate_item_list *criteria, + const SongFilter *filter, GError **error_r) { const Database *db = GetDatabase(error_r); if (db == nullptr) return false; - const DatabaseSelection selection("", true, criteria); + const DatabaseSelection selection("", true, filter); if (type == LOCATE_TAG_FILE_TYPE) { using namespace std::placeholders; |