oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist_state: save state when stopped 

At the moment mpd doesn't store or restore the current track to/from
its state file when the daemon is stopped/started while in 'stopped'
state.  I believe the preferred behaviour would be to store and
restore the current track even when the daemon is in stopped state
when shutting down.

I made a small patch to adapt this behaviour. If you believe this is
not the preferred behaviour, maybe this should be realized as a
configuration option. I'm not sure how to do this, but made a small
comment, where one would have to put the option.
This commit is contained in:
Christopher Zimmerman 2009-06-26 09:26:12 +02:00 committed by Max Kellermann
parent fe96bdf7e6
commit a641f562f3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -6,6 +6,7 @@ ver 0.16 (20??/??/??)
* commands: * commands:
- added new "status" line with more precise "elapsed time" - added new "status" line with more precise "elapsed time"
* log unused/unknown block parameters * log unused/unknown block parameters
* save state when stopped
ver 0.15 (2009/06/23) ver 0.15 (2009/06/23)

14
src/playlist_state.c
View File

@ -66,8 +66,12 @@ playlist_state_save(FILE *fp, const struct playlist *playlist)
playlist->current)); playlist->current));
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_TIME, fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_TIME,
getPlayerElapsedTime()); getPlayerElapsedTime());
} else } else {
fprintf(fp, "%s\n", PLAYLIST_STATE_FILE_STATE_STOP); fprintf(fp, "%s\n", PLAYLIST_STATE_FILE_STATE_STOP);
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_CURRENT,
queue_order_to_position(&playlist->queue,
playlist->current));
}
fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_RANDOM, fprintf(fp, "%s%i\n", PLAYLIST_STATE_FILE_RANDOM,
playlist->queue.random); playlist->queue.random);
@ -172,19 +176,19 @@ playlist_state_restore(FILE *fp, struct playlist *playlist)
(PLAYLIST_STATE_FILE_CURRENT)])); (PLAYLIST_STATE_FILE_CURRENT)]));
} else if (g_str_has_prefix(buffer, } else if (g_str_has_prefix(buffer,
PLAYLIST_STATE_FILE_PLAYLIST_BEGIN)) { PLAYLIST_STATE_FILE_PLAYLIST_BEGIN)) {
if (state == PLAYER_STATE_STOP)
current = -1;
playlist_state_load(fp, playlist, buffer); playlist_state_load(fp, playlist, buffer);
} }
} }
setPlaylistRandomStatus(playlist, random_mode); setPlaylistRandomStatus(playlist, random_mode);
if (state != PLAYER_STATE_STOP && !queue_is_empty(&playlist->queue)) { if (!queue_is_empty(&playlist->queue)) {
if (!queue_valid_position(&playlist->queue, current)) if (!queue_valid_position(&playlist->queue, current))
current = 0; current = 0;
if (seek_time == 0) if (state == PLAYER_STATE_STOP /* && config_option */)
playlist->current = current;
else if (seek_time == 0)
playPlaylist(playlist, current); playPlaylist(playlist, current);
else else
seekSongInPlaylist(playlist, current, seek_time); seekSongInPlaylist(playlist, current, seek_time);