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

handle single command and remove hacks used as substitute for it

Browse Source 
mpd-git has single command, which provides functionality
of both "repeat one" and "stop after current track" modes.

repeat one = single && repeat
stop after current track = single && !repeat
This commit is contained in:
Andrzej Rybczak
2009-03-27 16:40:55 +01:00
parent 88c37b581d
commit 5f41640cd9
12 changed files with 67 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/status.cpp
View File

@@ -175,7 +175,6 @@ void NcmpcppErrorCallback(Connection *Mpd, int errorid, const char *msg, void *)
void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
{
static size_t playing_song_scroll_begin = 0;
static bool repeat_one_allowed = 0;
static string player_state;
static MPD::Song np;
@@ -324,7 +323,6 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
wFooter->SetColor(Config.statusbar_color);
Playlist::ReloadRemaining = 1;
myPlaylist->NowPlaying = -1;
Config.stop_after_current_song = 0;
player_state.clear();
break;
}
@@ -342,30 +340,21 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
{
if (myPlaylist->isPlaying())
{
if (Config.repeat_one_mode && repeat_one_allowed)
Mpd->Play(myPlaylist->OldPlaying);
np = Mpd->GetCurrentSong();
WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format)));
if (Config.autocenter_mode && !myPlaylist->Main()->isFiltered())
myPlaylist->Main()->Highlight(myPlaylist->NowPlaying);
repeat_one_allowed = 0;
if (!Mpd->GetElapsedTime())
mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth());
if (Config.now_playing_lyrics && !Config.repeat_one_mode && myScreen == myLyrics && myOldScreen == myPlaylist)
if (Config.now_playing_lyrics && !Mpd->GetSingle() && myScreen == myLyrics && myOldScreen == myPlaylist)
Lyrics::Reload = 1;
}
Playlist::ReloadRemaining = 1;
playing_song_scroll_begin = 0;
if (Config.stop_after_current_song)
{
Mpd->Stop();
Config.stop_after_current_song = 0;
}
if (Mpd->GetState() == psPlay)
{
changed.ElapsedTime = 1;
@@ -377,10 +366,6 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
{
int elapsed = Mpd->GetElapsedTime();
// 'repeat one' mode check - be sure that we deal with item with known length
if (np.GetTotalLength() && elapsed == np.GetTotalLength()-1)
repeat_one_allowed = 1;
if (!block_statusbar_update && Config.statusbar_visibility)
{
string tracklength;
@@ -427,6 +412,7 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
static char mpd_repeat;
static char mpd_random;
static char mpd_single;
static char mpd_crossfade;
static char mpd_db_updating;
@@ -440,6 +426,11 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
mpd_random = Mpd->GetRandom() ? 'z' : 0;
ShowMessage("Random is %s", !mpd_random ? "off" : "on");
}
if (changed.Single)
{
mpd_single = Mpd->GetSingle() ? 's' : 0;
ShowMessage("Single is %s", !mpd_single ? "off" : "on");
}
if (changed.Crossfade)
{
int crossfade = Mpd->GetCrossfade();
@@ -460,6 +451,8 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
switch_state += mpd_repeat;
if (mpd_random)
switch_state += mpd_random;
if (mpd_single)
switch_state += mpd_single;
if (mpd_crossfade)
switch_state += mpd_crossfade;
if (mpd_db_updating)