diff options
| author | Andrzej Rybczak <electricityispower@gmail.com> | 2012-08-31 11:57:25 +0200 |
|---|---|---|
| committer | Andrzej Rybczak <electricityispower@gmail.com> | 2012-08-31 12:20:41 +0200 |
| commit | 1596c8ed401c7136153041932b35cfd8410f961f (patch) | |
| tree | 65bdab82c4c2c01315c875801d6e5750284b3852 /src/display.h | |
| parent | 1c46dec39f33dd06020ea529effe101874282d8b (diff) | |
menu: simplify ItemDisplayer further
Diffstat (limited to 'src/display.h')
| -rw-r--r-- | src/display.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/display.h b/src/display.h index 10b6b3fa..efd0c41c 100644 --- a/src/display.h +++ b/src/display.h @@ -32,27 +32,27 @@ namespace Display { std::string Columns(size_t); - template <typename T> void Default(Menu<T> &menu, const T &t) + template <typename T> void Default(Menu<T> &menu) { - menu << t; + menu << menu.Drawn().value(); } - template <typename A, typename B> void Pair(Menu< std::pair<A, B> > &menu, const std::pair<A, B> &pair) + template <typename A, typename B> void Pair(Menu< std::pair<A, B> > &menu) { - menu << pair.first; + menu << menu.Drawn().value().first; } - void SongsInColumns(Menu<MPD::Song> &menu, const MPD::Song &s, BasicScreen &screen); + void SongsInColumns(Menu<MPD::Song> &menu, BasicScreen &screen); - void Songs(Menu<MPD::Song> &menu, const MPD::Song &s, BasicScreen &screen, const std::string &format); + void Songs(Menu<MPD::Song> &menu, BasicScreen &screen, const std::string &format); - void Tags(Menu<MPD::MutableSong> &menu, const MPD::MutableSong &s); + void Tags(Menu<MPD::MutableSong> &menu); - void Outputs(Menu<MPD::Output> &menu, const MPD::Output &o); + void Outputs(Menu<MPD::Output> &menu); - void SearchEngine(Menu<SEItem> &menu, const SEItem &si); + void SearchEngine(Menu<SEItem> &menu); - void Items(Menu<MPD::Item> &menu, const MPD::Item &item); + void Items(Menu<MPD::Item> &menu); } #endif |