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

by popular demand: have stop remember the current song and play will start

Browse Source 
playing from the stopped song.

git-svn-id: https://svn.musicpd.org/mpd/trunk@1139 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-05-23 14:12:05 +00:00
parent fbcb995a81
commit 4a541faf12
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command.c
View File

@ -178,6 +178,7 @@ int commandStatus(FILE * fp, unsigned int * permission, int argArrayLength,
{ {
char * state = NULL; char * state = NULL;
int updateJobId; int updateJobId;
int song;
playPlaylistIfPlayerStopped(); playPlaylistIfPlayerStopped();
switch(getPlayerState()) { switch(getPlayerState()) {
@ -202,8 +203,9 @@ int commandStatus(FILE * fp, unsigned int * permission, int argArrayLength,
myfprintf(fp,"%s: %s\n",COMMAND_STATUS_STATE,state); myfprintf(fp,"%s: %s\n",COMMAND_STATUS_STATE,state);
song = getPlaylistCurrentSong();
if(song >= 0) myfprintf(fp,"%s: %i\n",COMMAND_STATUS_SONG,song);
if(getPlayerState()!=PLAYER_STATE_STOP) { if(getPlayerState()!=PLAYER_STATE_STOP) {
myfprintf(fp,"%s: %i\n",COMMAND_STATUS_SONG,getPlaylistCurrentSong());
myfprintf(fp,"%s: %i:%i\n",COMMAND_STATUS_TIME,getPlayerElapsedTime(),getPlayerTotalTime()); myfprintf(fp,"%s: %i:%i\n",COMMAND_STATUS_TIME,getPlayerElapsedTime(),getPlayerTotalTime());
myfprintf(fp,"%s: %li\n",COMMAND_STATUS_BITRATE,getPlayerBitRate(),getPlayerTotalTime()); myfprintf(fp,"%s: %li\n",COMMAND_STATUS_BITRATE,getPlayerBitRate(),getPlayerTotalTime());
myfprintf(fp,"%s: %u:%i:%i\n",COMMAND_STATUS_AUDIO,getPlayerSampleRate(),getPlayerBits(),getPlayerChannels()); myfprintf(fp,"%s: %u:%i:%i\n",COMMAND_STATUS_AUDIO,getPlayerSampleRate(),getPlayerBits(),getPlayerChannels());

36
src/playlist.c
View File

@ -101,6 +101,7 @@ void initPlaylist() {
playlist.version = 0; playlist.version = 0;
playlist.random = 0; playlist.random = 0;
playlist.queued = -1; playlist.queued = -1;
playlist.current = -1;
playlist_max_length = strtol((getConf())[CONF_MAX_PLAYLIST_LENGTH],&test,10); playlist_max_length = strtol((getConf())[CONF_MAX_PLAYLIST_LENGTH],&test,10);
if(*test!='\0') { if(*test!='\0') {
@ -501,8 +502,8 @@ int addSongToPlaylist(FILE * fp, Song * song) {
if(playlist.random) { if(playlist.random) {
int swap; int swap;
int start; int start;
if(playlist_state==PLAYLIST_STATE_STOP) start = 0; /*if(playlist_state==PLAYLIST_STATE_STOP) start = 0;
else if(playlist.queued>=0) start = playlist.queued+1; else */if(playlist.queued>=0) start = playlist.queued+1;
else start = playlist.current+1; else start = playlist.current+1;
swap = rand()%(playlist.length-start); swap = rand()%(playlist.length-start);
swap+=start; swap+=start;
@ -621,12 +622,12 @@ int deleteFromPlaylist(FILE * fp, int song) {
playerStop(stderr); playerStop(stderr);
playlist_noGoToNext = 1; playlist_noGoToNext = 1;
} }
else if(playlist_state!=PLAYLIST_STATE_STOP && else if(/*playlist_state!=PLAYLIST_STATE_STOP &&*/
playlist.current>songOrder) { playlist.current>songOrder) {
playlist.current--; playlist.current--;
} }
if(playlist_state!=PLAYLIST_STATE_STOP && playlist.queued>songOrder) { if(/*playlist_state!=PLAYLIST_STATE_STOP && */playlist.queued>songOrder) {
playlist.queued--; playlist.queued--;
} }
@ -682,7 +683,15 @@ int playPlaylist(FILE * fp, int song, int stopOnError) {
clearPlayerError(); clearPlayerError();
if(song==-1) i = 0; if(song==-1) {
if(playlist.current >= 0 && playlist.current < playlist.length)
{
i = playlist.current;
}
else {
i = 0;
}
}
else if(song<0) { else if(song<0) {
myfprintf(fp,"%s need integer >= -1\n",COMMAND_RESPOND_ERROR); myfprintf(fp,"%s need integer >= -1\n",COMMAND_RESPOND_ERROR);
playlist_state = PLAYLIST_STATE_STOP; playlist_state = PLAYLIST_STATE_STOP;
@ -700,17 +709,17 @@ int playPlaylist(FILE * fp, int song, int stopOnError) {
} }
if(playlist.random) { if(playlist.random) {
/*if(song == -1 && playlist_state==PLAYLIST_STATE_PLAY) { if(song == -1 && playlist_state==PLAYLIST_STATE_PLAY) {
randomizeOrder(0,playlist.length-1); randomizeOrder(0,playlist.length-1);
} }
else {*/ else {
if(song>=0) for(i=0;song!=playlist.order[i];i++); if(song>=0) for(i=0;song!=playlist.order[i];i++);
if(playlist_state==PLAYLIST_STATE_STOP) { if(playlist_state==PLAYLIST_STATE_STOP) {
playlist.current = 0; playlist.current = 0;
} }
swapOrder(i,playlist.current); swapOrder(i,playlist.current);
i = playlist.current; i = playlist.current;
/*}*/ }
} }
playlist_stopOnError = stopOnError; playlist_stopOnError = stopOnError;
@ -994,7 +1003,10 @@ int shufflePlaylist(FILE * fp) {
else playlist.current = 0; else playlist.current = 0;
i = 1; i = 1;
} }
else i = 0; else {
i = 0;
playlist.current = -1;
}
/* shuffle the rest of the list */ /* shuffle the rest of the list */
for(;i<playlist.length;i++) { for(;i<playlist.length;i++) {
ri = rand()%(playlist.length-1)+1; ri = rand()%(playlist.length-1)+1;
@ -1184,7 +1196,11 @@ int loadPlaylist(FILE * fp, char * utf8file) {
} }
int getPlaylistCurrentSong() { int getPlaylistCurrentSong() {
return playlist.order[playlist.current]; if(playlist.current >= 0 && playlist.current < playlist.length) {
return playlist.order[playlist.current];
}
return -1;
} }
unsigned long getPlaylistVersion() { unsigned long getPlaylistVersion() {