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

Merge branch 'integration' of git://github.com/yogan/ncmpcpp

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-03-05 21:17:08 +01:00
parent b113beed15 d139f2d8af
commit 4562167b8e
9 changed files with 190 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/ncmpcpp.cpp
View File

@@ -439,6 +439,51 @@ int main(int argc, char *argv[])
{
myScreen->Scroll(wDown, Key.Down);
}
else if (Keypressed(input, Key.UpAlbum) || Keypressed(input, Key.DownAlbum)
|| Keypressed(input, Key.UpArtist) || Keypressed(input, Key.DownArtist))
{
Menu<MPD::Song> *songs = NULL;
if (myScreen == myPlaylist && !myPlaylist->Items->Empty())
songs = myPlaylist->Items;
else if (myScreen->ActiveWindow() == myPlaylistEditor->Content)
songs = myPlaylistEditor->Content;
else if (myScreen == mySearcher)
mySearcher->Scroll(input);
if (songs && !songs->Empty())
{
size_t pos = songs->Choice();
if (Keypressed(input, Key.UpAlbum))
{
std::string album = songs->at(pos).GetAlbum();
while (pos > 0)
if (songs->at(--pos).GetAlbum() != album)
break;
}
else if (Keypressed(input, Key.DownAlbum))
{
std::string album = songs->at(pos).GetAlbum();
while (pos < songs->Size() - 1)
if (songs->at(++pos).GetAlbum() != album)
break;
}
else if (Keypressed(input, Key.UpArtist))
{
std::string artist = songs->at(pos).GetArtist();
while (pos > 0)
if (songs->at(--pos).GetArtist() != artist)
break;
}
else if (Keypressed(input, Key.DownArtist))
{
std::string artist = songs->at(pos).GetArtist();
while (pos < songs->Size() - 1)
if (songs->at(++pos).GetArtist() != artist)
break;
}
songs->Highlight(pos);
}
}
else if (Keypressed(input, Key.PageUp))
{
myScreen->Scroll(wPageUp, Key.PageUp);
@@ -1543,9 +1588,17 @@ int main(int argc, char *argv[])
}
else if (Keypressed(input, Key.GoToContainingDir))
{
Song *s = myScreen->CurrentSong();
if (s)
myBrowser->LocateSong(*s);
if (myScreen == myBrowser && myBrowser->Main()->Current().type == itPlaylist)
{
const std::string pl_name = myBrowser->Main()->Current().name;
myPlaylistEditor->JumpTo(pl_name);
}
else
{
Song *s = myScreen->CurrentSong();
if (s)
myBrowser->LocateSong(*s);
}
}
else if (Keypressed(input, Key.GoToMediaLibrary))
{