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

simplify code responsible for deleting songs a bit

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-01-30 18:09:03 +01:00
parent 38830d64f0
commit 4bb1fdb40d
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ncmpcpp.cpp
View File

@@ -576,9 +576,8 @@ int main(int argc, char *argv[])
} }
else else
{ {
Playlist::BlockNowPlayingUpdate = 1;
wFooter->SetTimeout(50); wFooter->SetTimeout(50);
int del_counter = 0; bool adjust_np = myPlaylist->NowPlaying > int(myPlaylist->CurrentSong()->GetPosition());
while (!myPlaylist->Items->Empty() && Keypressed(input, Key.Delete)) while (!myPlaylist->Items->Empty() && Keypressed(input, Key.Delete))
{ {
size_t id = myPlaylist->Items->Choice(); size_t id = myPlaylist->Items->Choice();
@@ -586,21 +585,19 @@ int main(int argc, char *argv[])
Playlist::BlockUpdate = 1; Playlist::BlockUpdate = 1;
myPlaylist->UpdateTimer(); myPlaylist->UpdateTimer();
// needed for keeping proper position of now playing song. // needed for keeping proper position of now playing song.
if (myPlaylist->NowPlaying > int(myPlaylist->CurrentSong()->GetPosition())-del_counter) if (adjust_np)
--myPlaylist->NowPlaying; --myPlaylist->NowPlaying;
if (Mpd.DeleteID(myPlaylist->CurrentSong()->GetID())) if (Mpd.DeleteID(myPlaylist->CurrentSong()->GetID()))
{ {
myPlaylist->Items->DeleteOption(id); myPlaylist->Items->DeleteOption(id);
myPlaylist->Items->Refresh(); myPlaylist->Items->Refresh();
wFooter->ReadKey(input); wFooter->ReadKey(input);
++del_counter;
} }
else else
break; break;
} }
myPlaylist->FixPositions(myPlaylist->Items->Choice()); myPlaylist->FixPositions(myPlaylist->Items->Choice());
wFooter->SetTimeout(ncmpcpp_window_timeout); wFooter->SetTimeout(ncmpcpp_window_timeout);
Playlist::BlockNowPlayingUpdate = 0;
} }
} }
else if ( else if (