aboutsummaryrefslogtreecommitdiffstats
path: root/src/song.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-11-11 02:59:16 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-11-11 02:59:16 +0000
commitd6a87f538d2347cd4610962a0004052c0c6ba8de (patch)
tree3bc0d5b0f93eb14d520f37607eec51fe456aafd0 /src/song.c
parent4ec3df033954d01663087011efecfca37749f965 (diff)
downloadmpd-d6a87f538d2347cd4610962a0004052c0c6ba8de.tar.gz
mpd-d6a87f538d2347cd4610962a0004052c0c6ba8de.tar.xz
mpd-d6a87f538d2347cd4610962a0004052c0c6ba8de.zip
ok, now song->url is only the filename, not the full path to the song
git-svn-id: https://svn.musicpd.org/mpd/trunk@2602 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/song.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/song.c b/src/song.c
index 5e35ecb2c..63310b2ff 100644
--- a/src/song.c
+++ b/src/song.c
@@ -86,7 +86,7 @@ void freeJustSong(Song * song) {
}
SongList * newSongList() {
- return makeList((ListFreeDataFunc *)freeSong);
+ return makeList((ListFreeDataFunc *)freeSong, 0);
}
Song * addSongToList(SongList * list, char * url, char * utf8path,
@@ -107,7 +107,7 @@ Song * addSongToList(SongList * list, char * url, char * utf8path,
if(song==NULL) return NULL;
- insertInList(list, url, (void *)song);
+ insertInList(list, song->url, (void *)song);
return song;
}
@@ -174,7 +174,7 @@ void insertSongIntoList(SongList * list, ListNode ** nextSongNode, char * key,
}
if(!(*nextSongNode)) {
- insertInList(list,key,(void *)song);
+ insertInList(list, song->url, (void *)song);
}
else if(cmpRet == 0) {
Song * tempSong = (Song *)((*nextSongNode)->data);
@@ -188,7 +188,8 @@ void insertSongIntoList(SongList * list, ListNode ** nextSongNode, char * key,
*nextSongNode = (*nextSongNode)->nextNode;
}
else {
- insertInListBeforeNode(list,*nextSongNode,key,(void *)song);
+ insertInListBeforeNode(list, *nextSongNode, song->url,
+ (void *)song);
}
}