diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-03-17 20:58:09 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-03-17 20:58:09 +0000 |
| commit | 290102fdddd3b46261ad0ad217f6ee6f08fc211b (patch) | |
| tree | bde10c0889db63e065c1ace84b48a2b0773b209c | |
| parent | e7151f941ce4111bcad9c983e3dd747c4f63ab6d (diff) | |
| download | mpd-290102fdddd3b46261ad0ad217f6ee6f08fc211b.tar.gz mpd-290102fdddd3b46261ad0ad217f6ee6f08fc211b.tar.xz mpd-290102fdddd3b46261ad0ad217f6ee6f08fc211b.zip | |
make playlist restart from current position in song when using state file
git-svn-id: https://svn.musicpd.org/mpd/trunk@269 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | src/playlist.c | 2 | ||||
| -rw-r--r-- | src/tag.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/playlist.c b/src/playlist.c index aa9647ec7..1d30fe9cb 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -244,6 +244,8 @@ void loadPlaylistFromStateFile(FILE * fp, char * buffer, int state, int current, } if(state==PLAYER_STATE_PAUSE) { playerPause(stderr); + } + if(state!=PLAYER_STATE_STOP) { seekSongInPlaylist(stderr,playlist.length-1, time); } @@ -170,11 +170,12 @@ MpdTag * mp3TagDup(char * utf8file) { #ifdef HAVE_FAAD MpdTag * mp4TagDup(char * utf8file) { MpdTag * ret = NULL; - int time = -1; + int time; #warning implement mp4 tag parsing, this includes using mp4v2 and id3 #warning getMp4TotalTime needs implementing //time = getMp4TotalTime(rmp2amp(utf8ToFsCharset(utf8file))); + time = 0; if(time>=0) { if(!ret) ret = newMpdTag(); @@ -186,10 +187,11 @@ MpdTag * mp4TagDup(char * utf8file) { MpdTag * aacTagDup(char * utf8file) { MpdTag * ret = NULL; - int time = -1; + int time; #warning getMp4TotalTime needs implementing //time = getAacTotalTime(rmp2amp(utf8ToFsCharset(utf8file))); + time = 0; if(time>=0) { if(!ret) ret = newMpdTag(); |