Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use std::bind instead of passing void pointers around

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-08-30 07:52:39 +02:00
parent 798c9b3121
commit 7297b8a9ad
21 changed files with 187 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/display.h
View File

@@ -30,35 +30,29 @@
namespace Display
{
struct ScreenFormat
{
BasicScreen *screen;
std::string *format;
};
std::string Columns(size_t);
template <typename T> void Default(const T &t, void *, Menu<T> *menu)
template <typename T> void Default(Menu<T> &menu, const T &t)
{
*menu << t;
menu << t;
}
template <typename A, typename B> void Pair(const std::pair<A, B> &pair, void *, Menu< std::pair<A, B> > *menu)
template <typename A, typename B> void Pair(Menu< std::pair<A, B> > &menu, const std::pair<A, B> &pair)
{
*menu << pair.first;
menu << pair.first;
}
void SongsInColumns(const MPD::Song &, void *, Menu<MPD::Song> *);
void SongsInColumns(Menu<MPD::Song> &menu, const MPD::Song &s, BasicScreen &screen);
void Songs(const MPD::Song &, void *, Menu<MPD::Song> *);
void Songs(Menu<MPD::Song> &menu, const MPD::Song &s, BasicScreen &screen, const std::string &format);
void Tags(const MPD::MutableSong &, void *, Menu<MPD::MutableSong> *);
void Tags(Menu<MPD::MutableSong> &menu, const MPD::MutableSong &s);
void Outputs(const MPD::Output &, void *, Menu<MPD::Output> *);
void Outputs(Menu<MPD::Output> &menu, const MPD::Output &o);
void SearchEngine(const SEItem &, void *, Menu<SEItem> *);
void SearchEngine(Menu<SEItem> &menu, const SEItem &si);
void Items(const MPD::Item &, void *, Menu<MPD::Item> *);
void Items(Menu<MPD::Item> &menu, const MPD::Item &item);
}
#endif