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

remove duplicated (and by the way quite broken) code

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-08-25 01:46:30 +02:00
parent cef5433d5f
commit 68b724d9de
1 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ncmpcpp.cpp
View File

@@ -1064,39 +1064,13 @@ int main(int argc, char *argv[])
SongList list; SongList list;
Mpd.GetDirectoryRecursive(path, list); Mpd.GetDirectoryRecursive(path, list);
if (!list.empty()) if (!list.empty())
{ myPlaylist->Add(list, 0);
Mpd.StartCommandsList();
SongList::const_iterator it = list.begin();
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() && myScreen != myPlaylistEditor)
{
Song &s = myPlaylist->Main()->at(myPlaylist->Main()->Size()-list.size());
if (s.GetHash() != list[0]->GetHash())
ShowMessage("%s", MPD::Message::PartOfSongsAdded);
}
}
else else
{ {
if (myScreen == myPlaylistEditor) if (myScreen == myPlaylistEditor)
{
Mpd.AddToPlaylist(myPlaylistEditor->Playlists->Current(), path); Mpd.AddToPlaylist(myPlaylistEditor->Playlists->Current(), path);
}
else else
{
Mpd.AddSong(path); Mpd.AddSong(path);
}
} }
if (myScreen == myPlaylistEditor) if (myScreen == myPlaylistEditor)
myPlaylistEditor->Content->Clear(0); // make it refetch content of playlist myPlaylistEditor->Content->Clear(0); // make it refetch content of playlist