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

move code responsible for marking song as now playing to display functions

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-09-20 23:52:43 +02:00
parent b47ad169dc
commit 5a887861d7
4 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/display.cpp
View File

@@ -19,7 +19,6 @@
***************************************************************************/
#include "display.h"
#include "global.h"
#include "helpers.h"
#include "playlist.h"
@@ -106,6 +105,10 @@ void Display::SongsInColumns(const MPD::Song &s, void *, Menu<MPD::Song> *menu)
if (!s.Localized())
const_cast<MPD::Song *>(&s)->Localize();
bool is_now_playing = menu == myPlaylist->Items && menu->CurrentlyDrawedPosition() == myPlaylist->NowPlaying;
if (is_now_playing)
*menu << fmtBold;
if (Config.columns.empty())
return;
@@ -205,6 +208,8 @@ void Display::SongsInColumns(const MPD::Song &s, void *, Menu<MPD::Song> *menu)
}
if ((--it)->color != clDefault)
*menu << clEnd;
if (is_now_playing)
*menu << fmtBoldEnd;
}
void Display::Songs(const MPD::Song &s, void *data, Menu<MPD::Song> *menu)
@@ -212,6 +217,10 @@ void Display::Songs(const MPD::Song &s, void *data, Menu<MPD::Song> *menu)
if (!s.Localized())
const_cast<MPD::Song *>(&s)->Localize();
bool is_now_playing = menu == myPlaylist->Items && menu->CurrentlyDrawedPosition() == myPlaylist->NowPlaying;
if (is_now_playing)
*menu << fmtBold;
std::string line = s.toString(*static_cast<std::string *>(data));
for (std::string::const_iterator it = line.begin(); it != line.end(); ++it)
{
@@ -235,6 +244,8 @@ void Display::Songs(const MPD::Song &s, void *data, Menu<MPD::Song> *menu)
else
*menu << *it;
}
if (is_now_playing)
*menu << fmtBoldEnd;
}
void Display::Tags(const MPD::Song &s, void *data, Menu<MPD::Song> *menu)