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

fix a nasty bug when deleting a stream from the playlist

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1082 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-05-19 05:07:31 +00:00
parent ef8209e129
commit 33faf9812c
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/directory.c
View File

@ -1229,7 +1229,7 @@ void initMp3Directory() {
Song * getSongDetails(char * file, char ** shortnameRet, Song * getSongDetails(char * file, char ** shortnameRet,
Directory ** directoryRet) Directory ** directoryRet)
{ {
void * song; void * song = NULL;
Directory * directory; Directory * directory;
char * dir = NULL; char * dir = NULL;
char * dup = strdup(file); char * dup = strdup(file);

15
src/playlist.c
View File

@ -138,6 +138,12 @@ void initPlaylist() {
} }
void finishPlaylist() { void finishPlaylist() {
int i;
for(i=0;i<playlist.length;i++) {
if(playlist.songs[i]->type == SONG_TYPE_URL) {
/*freeJustSong(playlist.songs[i]);*/
}
}
free(playlist.songs); free(playlist.songs);
playlist.songs = NULL; playlist.songs = NULL;
free(playlist.order); free(playlist.order);
@ -151,7 +157,7 @@ int clearPlaylist(FILE * fp) {
for(i=0;i<playlist.length;i++) { for(i=0;i<playlist.length;i++) {
if(playlist.songs[i]->type == SONG_TYPE_URL) { if(playlist.songs[i]->type == SONG_TYPE_URL) {
free(playlist.songs[i]); /*freeJustSong(playlist.songs[i]);*/
} }
playlist.songs[i] = NULL; playlist.songs[i] = NULL;
} }
@ -584,6 +590,10 @@ int deleteFromPlaylist(FILE * fp, int song) {
} }
} }
if(playlist.songs[song]->type == SONG_TYPE_URL) {
freeJustSong(playlist.songs[song]);
}
/* delete song from songs array */ /* delete song from songs array */
for(i=song;i<playlist.length-1;i++) { for(i=song;i<playlist.length-1;i++) {
playlist.songs[i] = playlist.songs[i+1]; playlist.songs[i] = playlist.songs[i+1];
@ -600,9 +610,6 @@ int deleteFromPlaylist(FILE * fp, int song) {
if(playlist.order[i]>song) playlist.order[i]--; if(playlist.order[i]>song) playlist.order[i]--;
} }
/* now take care of other misc stuff */ /* now take care of other misc stuff */
if(playlist.songs[playlist.length-1]->type == SONG_TYPE_URL) {
freeJustSong(playlist.songs[playlist.length-1]);
}
playlist.songs[playlist.length-1] = NULL; playlist.songs[playlist.length-1] = NULL;
playlist.length--; playlist.length--;

4
src/song.h
View File

@ -31,8 +31,8 @@
#include "list.h" #include "list.h"
typedef enum { typedef enum {
SONG_TYPE_FILE, SONG_TYPE_FILE = 1,
SONG_TYPE_URL SONG_TYPE_URL = 2
} SONG_TYPE; } SONG_TYPE;
typedef struct _Song { typedef struct _Song {