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

improve playlist updating

Browse Source 
the case when sizes of mpd's and ncmpcpp's are equal is redundant.
what is more, it caused unneded overhead, because it was comparing
whole playlists. plchanges commands returns only songs that have
really changed, so this piece of code was simply wrong.
This commit is contained in:
Andrzej Rybczak
2009-03-12 21:26:56 +01:00
parent 502ce9be6a
commit c7689d72d6
1 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/status.cpp
View File

@@ -190,54 +190,38 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
myPlaylist->Main()->ShowAll();
SongList list;
size_t playlist_length = Mpd->GetPlaylistLength();
if (playlist_length != myPlaylist->Main()->Size())
if (playlist_length < myPlaylist->Main()->Size())
{
if (playlist_length < myPlaylist->Main()->Size())
{
myPlaylist->Main()->Clear(playlist_length < myPlaylist->Main()->GetHeight() && myScreen == myPlaylist);
Mpd->GetPlaylistChanges(-1, list);
}
else
Mpd->GetPlaylistChanges(Mpd->GetOldPlaylistID(), list);
myPlaylist->Main()->Reserve(playlist_length);
for (SongList::const_iterator it = list.begin(); it != list.end(); it++)
{
int pos = (*it)->GetPosition();
if (pos < int(myPlaylist->Main()->Size()))
{
// if song's already in playlist, replace it with a new one
myPlaylist->Main()->at(pos) = **it;
}
else
{
// otherwise just add it to playlist
myPlaylist->Main()->AddOption(**it, myPlaylist->NowPlaying == pos);
}
myPlaylist->Main()->at(pos).CopyPtr(0);
(*it)->NullMe();
}
if (myScreen == myPlaylist)
{
if (!playlist_length || myPlaylist->Main()->Size() < myPlaylist->Main()->GetHeight())
myPlaylist->Main()->Window::Clear();
myPlaylist->Main()->Refresh();
}
myPlaylist->Main()->Clear(playlist_length < myPlaylist->Main()->GetHeight() && myScreen == myPlaylist);
Mpd->GetPlaylistChanges(-1, list);
}
else
Mpd->GetPlaylistChanges(Mpd->GetOldPlaylistID(), list);
myPlaylist->Main()->Reserve(playlist_length);
for (SongList::const_iterator it = list.begin(); it != list.end(); it++)
{
Mpd->GetPlaylistChanges(-1, list);
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
int pos = (*it)->GetPosition();
if (pos < int(myPlaylist->Main()->Size()))
{
if (*list[i] != myPlaylist->Main()->at(i))
{
myPlaylist->Main()->at(i) = *list[i];
myPlaylist->Main()->at(i).CopyPtr(0);
list[i]->NullMe();
}
// if song's already in playlist, replace it with a new one
myPlaylist->Main()->at(pos) = **it;
}
else
{
// otherwise just add it to playlist
myPlaylist->Main()->AddOption(**it, myPlaylist->NowPlaying == pos);
}
myPlaylist->Main()->at(pos).CopyPtr(0);
(*it)->NullMe();
}
if (myScreen == myPlaylist)
{
if (!playlist_length || myPlaylist->Main()->Size() < myPlaylist->Main()->GetHeight())
myPlaylist->Main()->Window::Clear();
myPlaylist->Main()->Refresh();
}
if (was_filtered)
myPlaylist->ApplyFilter(myPlaylist->Main()->GetFilter());