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

lastfm: redesigned plugins system

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-08-13 05:20:12 +02:00
parent d4a5574146
commit a1cd5ae1aa
8 changed files with 308 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ncmpcpp.cpp
View File

@@ -48,7 +48,7 @@
#include "settings.h"
#include "song.h"
#include "song_info.h"
#include "info.h"
#include "lastfm.h"
#include "outputs.h"
#include "status.h"
#include "tag_editor.h"
@@ -140,7 +140,7 @@ namespace
mySearcher->hasToBeResized = 1;
myLibrary->hasToBeResized = 1;
myPlaylistEditor->hasToBeResized = 1;
myInfo->hasToBeResized = 1;
myLastfm->hasToBeResized = 1;
myLyrics->hasToBeResized = 1;
mySelectedItemsAdder->hasToBeResized = 1;
@@ -1899,7 +1899,7 @@ int main(int argc, char *argv[])
if (myScreen == myPlaylist)
myPlaylist->EnableHighlighting();
}
else if (myScreen == myHelp || myScreen == myLyrics || myScreen == myInfo)
else if (myScreen == myHelp || myScreen == myLyrics || myScreen == myLastfm)
{
LockStatusbar();
Statusbar() << "Find: ";
@@ -2042,6 +2042,10 @@ int main(int argc, char *argv[])
{
myLyrics->Refetch();
}
else if (myScreen == myLastfm)
{
myLastfm->Refetch();
}
}
else if (Keypressed(input, Key.SongInfo))
{
@@ -2050,7 +2054,22 @@ int main(int argc, char *argv[])
# ifdef HAVE_CURL_CURL_H
else if (Keypressed(input, Key.ArtistInfo))
{
myInfo->GetArtist();
if (myScreen == myLastfm)
{
myLastfm->SwitchTo();
continue;
}
std::string artist;
MPD::Song *s = myScreen->CurrentSong();
if (s)
artist = s->GetArtist();
else if (myScreen == myLibrary && myLibrary->Main() == myLibrary->Artists)
artist = myLibrary->Artists->Current();
if (!artist.empty() && myLastfm->SetArtistInfoArgs(artist))
myLastfm->SwitchTo();
}
# endif // HAVE_CURL_CURL_H
else if (Keypressed(input, Key.Lyrics))