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

Modernize lyrics screen

Browse Source
This commit is contained in:
Andrzej Rybczak
2016-11-20 14:49:56 +01:00
parent c6f5933bf9
commit b018efceb6
10 changed files with 377 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/actions.cpp
View File

@@ -1148,7 +1148,7 @@ bool ToggleLyricsFetcher::canBeRun()
void ToggleLyricsFetcher::run()
{
# ifdef HAVE_CURL_CURL_H
myLyrics->ToggleFetcher();
myLyrics->toggleFetcher();
# endif // HAVE_CURL_CURL_H
}
@@ -1601,7 +1601,7 @@ bool EditLyrics::canBeRun()
void EditLyrics::run()
{
myLyrics->Edit();
myLyrics->edit();
}
bool JumpToBrowser::canBeRun()
@@ -2309,7 +2309,7 @@ bool RefetchLyrics::canBeRun()
void RefetchLyrics::run()
{
# ifdef HAVE_CURL_CURL_H
myLyrics->Refetch();
myLyrics->refetchCurrent();
# endif // HAVE_CURL_CURL_H
}
@@ -2444,8 +2444,24 @@ void ShowArtistInfo::run()
# endif // HAVE_CURL_CURL_H
}
bool ShowLyrics::canBeRun()
{
if (myScreen == myLyrics)
{
m_song = nullptr;
return true;
}
else
{
m_song = currentSong(myScreen);
return m_song != nullptr;
}
}
void ShowLyrics::run()
{
if (m_song != nullptr)
myLyrics->fetch(*m_song);
myLyrics->switchTo();
}