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

add ('a') items to currently selected playlist in playlist editor

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-03-16 17:10:43 +01:00
parent 8a1223aa18
commit a1b08c5776
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ncmpcpp.cpp
View File

@@ -875,8 +875,10 @@ int main(int argc, char *argv[])
}
else if (Keypressed(input, Key.Add))
{
if (myScreen == myPlaylistEditor && myPlaylistEditor->Playlists->Empty())
continue;
LockStatusbar();
Statusbar() << "Add: ";
Statusbar() << (myScreen == myPlaylistEditor ? "Add to playlist: " : "Add: ");
string path = wFooter->GetString();
UnlockStatusbar();
if (!path.empty())
@@ -887,12 +889,20 @@ int main(int argc, char *argv[])
{
Mpd->StartCommandsList();
SongList::const_iterator it = list.begin();
for (; it != list.end(); it++)
if (Mpd->AddSong(**it) < 0)
break;
if (myScreen == myPlaylistEditor)
{
for (; it != list.end(); it++)
Mpd->AddToPlaylist(myPlaylistEditor->Playlists->Current(), **it);
}
else
{
for (; it != list.end(); it++)
if (Mpd->AddSong(**it) < 0)
break;
}
Mpd->CommitCommandsList();
if (it != list.begin())
if (it != list.begin() && myScreen != myPlaylistEditor)
{
Song &s = myPlaylist->Main()->at(myPlaylist->Main()->Size()-list.size());
if (s.GetHash() != list[0]->GetHash())
@@ -900,7 +910,18 @@ int main(int argc, char *argv[])
}
}
else
Mpd->AddSong(path);
{
if (myScreen == myPlaylistEditor)
{
Mpd->AddToPlaylist(myPlaylistEditor->Playlists->Current(), path);
}
else
{
Mpd->AddSong(path);
}
}
if (myScreen == myPlaylistEditor)
myPlaylistEditor->Content->Clear(0); // make it refetch content of playlist
FreeSongList(list);
}
}