menu: simplify ItemDisplayer further

This commit is contained in:
Andrzej Rybczak
2012-08-31 11:57:25 +02:00
parent 1c46dec39f
commit 1596c8ed40
9 changed files with 60 additions and 50 deletions

View File

@@ -84,7 +84,7 @@ void MediaLibrary::Init()
Songs->CenteredCursor(Config.centered_cursor);
Songs->SetSelectPrefix(Config.selected_item_prefix);
Songs->SetSelectSuffix(Config.selected_item_suffix);
Songs->setItemDisplayer(std::bind(Display::Songs, _1, _2, *this, Config.song_library_format));
Songs->setItemDisplayer(std::bind(Display::Songs, _1, *this, Config.song_library_format));
Songs->SetItemStringifier(SongToString);
w = Artists;
@@ -768,13 +768,14 @@ std::string MediaLibrary::AlbumToString(const SearchConstraints &sc)
return result;
}
void MediaLibrary::DisplayAlbums(Menu<SearchConstraints> &menu, const SearchConstraints &sc)
void MediaLibrary::DisplayAlbums(Menu<SearchConstraints> &menu)
{
menu << AlbumToString(sc);
menu << AlbumToString(menu.Drawn().value());
}
void MediaLibrary::DisplayPrimaryTags(Menu<std::string> &menu, const std::string &tag)
void MediaLibrary::DisplayPrimaryTags(Menu<std::string> &menu)
{
const std::string &tag = menu.Drawn().value();
if (tag.empty())
menu << Config.empty_tag;
else