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

new command "addid", this is the same as "add" command, except it also returns the songid of the added song. Note that "addid" does not work on directories

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2487 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-11-02 23:44:33 +00:00
parent 78c5d884d2
commit f468aba16e
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/playlist.c
View File

@@ -315,7 +315,7 @@ void loadPlaylistFromStateFile(FILE * fp, char * buffer, int state, int current,
playlist_stateFile);
exit(EXIT_FAILURE);
}
if(addToPlaylist(stderr,temp)==0 && current==song) {
if(addToPlaylist(stderr, temp, 0)==0 && current==song) {
if(state!=PLAYER_STATE_STOP) {
playPlaylist(stderr,playlist.length-1,0);
}
@@ -595,7 +595,7 @@ void clearPlayerQueue() {
}
}
int addToPlaylist(FILE * fp, char * url) {
int addToPlaylist(FILE * fp, char * url, int printId) {
Song * song;
DEBUG("add to playlist: %s\n",url);
@@ -613,10 +613,12 @@ int addToPlaylist(FILE * fp, char * url) {
return -1;
}
return addSongToPlaylist(fp,song);
return addSongToPlaylist(fp,song, printId);
}
int addSongToPlaylist(FILE * fp, Song * song) {
int addSongToPlaylist(FILE * fp, Song * song, int printId) {
int id;
if(playlist.length==playlist_max_length) {
commandError(fp, ACK_ERROR_PLAYLIST_MAX,
"playlist is at the max size", NULL);
@@ -631,10 +633,12 @@ int addSongToPlaylist(FILE * fp, Song * song) {
}
}
id = getNextId();
playlist.songs[playlist.length] = song;
playlist.songMod[playlist.length] = playlist.version;
playlist.order[playlist.length] = playlist.length;
playlist.positionToId[playlist.length] = getNextId();
playlist.positionToId[playlist.length] = id;
playlist.idToPosition[playlist.positionToId[playlist.length]] = playlist.length;
playlist.length++;
@@ -653,6 +657,8 @@ int addSongToPlaylist(FILE * fp, Song * song) {
incrPlaylistVersion();
if(printId) myfprintf(fp, "Id: %i\n", id);
return 0;
}
@@ -1400,7 +1406,7 @@ int loadPlaylist(FILE * fp, char * utf8file) {
free(temp);
continue;
}
if((addToPlaylist(stderr,temp))<0) {
if((addToPlaylist(stderr, temp, 0))<0) {
if(!erroredFile) erroredFile = strdup(temp);
}
free(temp);