split majority of helpers and rewrite a few heinous functions

This commit is contained in:
Andrzej Rybczak
2012-08-29 11:46:17 +02:00
parent 4cb0e2232a
commit b1c301dc1c
31 changed files with 427 additions and 373 deletions

View File

@@ -352,12 +352,11 @@ void Display::Tags(const MPD::MutableSong &s, void *data, Menu<MPD::MutableSong>
}
}
void Display::Outputs (const MPD::Output &o, void * , Menu< MPD::Output > *menu)
void Display::Outputs(const MPD::Output &o, void * , Menu< MPD::Output > *menu)
{
*menu << o.name();
}
void Display::Items(const MPD::Item &item, void *data, Menu<MPD::Item> *menu)
{
switch (item.type)
@@ -369,7 +368,7 @@ void Display::Items(const MPD::Item &item, void *data, Menu<MPD::Item> *menu)
*menu << "[..]";
return;
}
*menu << "[" << ExtractTopName(item.name) << "]";
*menu << "[" << getBasename(item.name) << "]";
return;
}
case MPD::itSong:
@@ -379,7 +378,7 @@ void Display::Items(const MPD::Item &item, void *data, Menu<MPD::Item> *menu)
Display::SongsInColumns(item.song, data, reinterpret_cast<Menu<MPD::Song> *>(menu));
return;
case MPD::itPlaylist:
*menu << Config.browser_playlist_prefix << ExtractTopName(item.name);
*menu << Config.browser_playlist_prefix << getBasename(item.name);
return;
default:
return;