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

fix now playing update if playlist is filtered

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-03-15 13:35:18 +01:00
parent 31ab01cc1c
commit 1e511d1d8d
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ncmpcpp.cpp
View File

@@ -458,17 +458,20 @@ int main(int argc, char *argv[])
{ {
Playlist::BlockNowPlayingUpdate = 1; Playlist::BlockNowPlayingUpdate = 1;
myPlaylist->Main()->SetTimeout(50); myPlaylist->Main()->SetTimeout(50);
int del_counter = 0;
while (!myPlaylist->Main()->Empty() && Keypressed(input, Key.Delete)) while (!myPlaylist->Main()->Empty() && Keypressed(input, Key.Delete))
{ {
size_t id = myPlaylist->Main()->Choice(); size_t id = myPlaylist->Main()->Choice();
TraceMpdStatus(); TraceMpdStatus();
myPlaylist->UpdateTimer(); myPlaylist->UpdateTimer();
if (myPlaylist->NowPlaying > myPlaylist->CurrentSong()->GetPosition()) // needed for keeping proper // needed for keeping proper position of now playing song.
myPlaylist->NowPlaying--; // position of now playing song. if (myPlaylist->NowPlaying > myPlaylist->CurrentSong()->GetPosition()-del_counter)
myPlaylist->NowPlaying--;
Mpd->DeleteID(myPlaylist->CurrentSong()->GetID()); Mpd->DeleteID(myPlaylist->CurrentSong()->GetID());
myPlaylist->Main()->DeleteOption(id); myPlaylist->Main()->DeleteOption(id);
myPlaylist->Main()->Refresh(); myPlaylist->Main()->Refresh();
myPlaylist->Main()->ReadKey(input); myPlaylist->Main()->ReadKey(input);
del_counter++;
} }
myPlaylist->FixPositions(myPlaylist->Main()->Choice()); myPlaylist->FixPositions(myPlaylist->Main()->Choice());
myPlaylist->Main()->SetTimeout(ncmpcpp_window_timeout); myPlaylist->Main()->SetTimeout(ncmpcpp_window_timeout);

20
src/status.cpp
View File

@@ -172,12 +172,20 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
{ {
myPlaylist->OldPlaying = myPlaylist->NowPlaying; myPlaylist->OldPlaying = myPlaylist->NowPlaying;
myPlaylist->NowPlaying = Mpd->GetCurrentSongPos(); myPlaylist->NowPlaying = Mpd->GetCurrentSongPos();
bool was_filtered = myPlaylist->Main()->isFiltered();
myPlaylist->Main()->ShowAll();
try try
{ {
myPlaylist->Main()->BoldOption(myPlaylist->OldPlaying, 0); myPlaylist->Main()->BoldOption(myPlaylist->OldPlaying, 0);
}
catch (std::out_of_range) { }
try
{
myPlaylist->Main()->BoldOption(myPlaylist->NowPlaying, 1); myPlaylist->Main()->BoldOption(myPlaylist->NowPlaying, 1);
} }
catch (std::out_of_range) { } catch (std::out_of_range) { }
if (was_filtered)
myPlaylist->Main()->ShowFiltered();
} }
if (changed.Playlist) if (changed.Playlist)
@@ -280,7 +288,6 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
case psPlay: case psPlay:
{ {
player_state = "Playing: "; player_state = "Playing: ";
myPlaylist->Main()->BoldOption(myPlaylist->NowPlaying, 1);
Playlist::ReloadRemaining = 1; Playlist::ReloadRemaining = 1;
changed.ElapsedTime = 1; changed.ElapsedTime = 1;
break; break;
@@ -296,11 +303,6 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
wFooter->SetColor(Config.progressbar_color); wFooter->SetColor(Config.progressbar_color);
mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth()); mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth());
wFooter->SetColor(Config.statusbar_color); wFooter->SetColor(Config.statusbar_color);
try
{
myPlaylist->Main()->BoldOption(myPlaylist->OldPlaying, 0);
}
catch (std::out_of_range) { }
Playlist::ReloadRemaining = 1; Playlist::ReloadRemaining = 1;
myPlaylist->NowPlaying = -1; myPlaylist->NowPlaying = -1;
Config.stop_after_current_song = 0; Config.stop_after_current_song = 0;
@@ -326,14 +328,8 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
std::swap(myPlaylist->NowPlaying, myPlaylist->OldPlaying); std::swap(myPlaylist->NowPlaying, myPlaylist->OldPlaying);
Mpd->Play(myPlaylist->NowPlaying); Mpd->Play(myPlaylist->NowPlaying);
} }
try
{
myPlaylist->Main()->BoldOption(myPlaylist->OldPlaying, 0);
}
catch (std::out_of_range &) { }
np = Mpd->GetCurrentSong(); np = Mpd->GetCurrentSong();
WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format))); WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format)));
myPlaylist->Main()->BoldOption(myPlaylist->NowPlaying, 1);
if (Config.autocenter_mode && !myPlaylist->Main()->isFiltered()) if (Config.autocenter_mode && !myPlaylist->Main()->isFiltered())
myPlaylist->Main()->Highlight(myPlaylist->NowPlaying); myPlaylist->Main()->Highlight(myPlaylist->NowPlaying);
repeat_one_allowed = 0; repeat_one_allowed = 0;