Commit 290102fd authored by Warren Dukes's avatar Warren Dukes

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
parent e7151f94
...@@ -244,6 +244,8 @@ void loadPlaylistFromStateFile(FILE * fp, char * buffer, int state, int current, ...@@ -244,6 +244,8 @@ void loadPlaylistFromStateFile(FILE * fp, char * buffer, int state, int current,
} }
if(state==PLAYER_STATE_PAUSE) { if(state==PLAYER_STATE_PAUSE) {
playerPause(stderr); playerPause(stderr);
}
if(state!=PLAYER_STATE_STOP) {
seekSongInPlaylist(stderr,playlist.length-1, seekSongInPlaylist(stderr,playlist.length-1,
time); time);
} }
......
...@@ -170,11 +170,12 @@ MpdTag * mp3TagDup(char * utf8file) { ...@@ -170,11 +170,12 @@ MpdTag * mp3TagDup(char * utf8file) {
#ifdef HAVE_FAAD #ifdef HAVE_FAAD
MpdTag * mp4TagDup(char * utf8file) { MpdTag * mp4TagDup(char * utf8file) {
MpdTag * ret = NULL; MpdTag * ret = NULL;
int time = -1; int time;
#warning implement mp4 tag parsing, this includes using mp4v2 and id3 #warning implement mp4 tag parsing, this includes using mp4v2 and id3
#warning getMp4TotalTime needs implementing #warning getMp4TotalTime needs implementing
//time = getMp4TotalTime(rmp2amp(utf8ToFsCharset(utf8file))); //time = getMp4TotalTime(rmp2amp(utf8ToFsCharset(utf8file)));
time = 0;
if(time>=0) { if(time>=0) {
if(!ret) ret = newMpdTag(); if(!ret) ret = newMpdTag();
...@@ -186,10 +187,11 @@ MpdTag * mp4TagDup(char * utf8file) { ...@@ -186,10 +187,11 @@ MpdTag * mp4TagDup(char * utf8file) {
MpdTag * aacTagDup(char * utf8file) { MpdTag * aacTagDup(char * utf8file) {
MpdTag * ret = NULL; MpdTag * ret = NULL;
int time = -1; int time;
#warning getMp4TotalTime needs implementing #warning getMp4TotalTime needs implementing
//time = getAacTotalTime(rmp2amp(utf8ToFsCharset(utf8file))); //time = getAacTotalTime(rmp2amp(utf8ToFsCharset(utf8file)));
time = 0;
if(time>=0) { if(time>=0) {
if(!ret) ret = newMpdTag(); if(!ret) ret = newMpdTag();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment