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

make Playlist::NowPlayingSong() return pointer, not reference

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-02-19 00:00:31 +01:00
parent 072f611896
commit 3b32d84a76
5 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lyrics.cpp
View File

@@ -78,8 +78,8 @@ void Lyrics::Update()
if (!Reload)
return;
const MPD::Song &s = myPlaylist->NowPlayingSong();
if (!s.GetArtist().empty() && !s.GetTitle().empty())
const MPD::Song *s = myPlaylist->NowPlayingSong();
if (s && !s->GetArtist().empty() && !s->GetTitle().empty())
SwitchTo();
else
Reload = 0;
@@ -106,7 +106,7 @@ void Lyrics::SwitchTo()
}
# endif
const MPD::Song *s = Reload ? &myPlaylist->NowPlayingSong() : myScreen->CurrentSong();
const MPD::Song *s = Reload ? myPlaylist->NowPlayingSong() : myScreen->CurrentSong();
if (!s)
return;
@@ -117,6 +117,7 @@ void Lyrics::SwitchTo()
Resize();
itsScrollBegin = 0;
itsSong = *s;
itsSong.Localize();
if (!Reload)
{
myOldScreen = myScreen;