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

playlist: clear pc.errored_song on delete

Browse Source 
When a (remote) song is deleted from the playlist, there may still be
a reference to it in pc.errored_song.  Clear this reference.
This commit is contained in:
Max Kellermann 2008-12-17 16:45:49 +01:00
parent 25c04a97d3
commit 13192546a8
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/player_control.c
View File

@ -44,6 +44,13 @@ void pc_deinit(void)
notify_deinit(&pc.notify); notify_deinit(&pc.notify);
} }
void
pc_song_deleted(const struct song *song)
{
if (pc.errored_song == song)
pc.errored_song = NULL;
}
static void player_command(enum player_command cmd) static void player_command(enum player_command cmd)
{ {
pc.command = cmd; pc.command = cmd;

8
src/player_control.h
View File

@ -84,6 +84,14 @@ void pc_init(unsigned int buffered_before_play);
void pc_deinit(void); void pc_deinit(void);
/**
* Call this function when the specified song pointer is about to be
* invalidated. This makes sure that player_control.errored_song does
* not point to an invalid pointer.
*/
void
pc_song_deleted(const struct song *song);
void void
playerPlay(struct song *song); playerPlay(struct song *song);

10
src/playlist.c
View File

@ -200,8 +200,10 @@ void clearPlaylist(void)
stopPlaylist(); stopPlaylist();
for (unsigned i = 0; i < playlist.length; i++) { for (unsigned i = 0; i < playlist.length; i++) {
if (!song_in_database(playlist.songs[i])) if (!song_in_database(playlist.songs[i])) {
pc_song_deleted(playlist.songs[i]);
song_free(playlist.songs[i]); song_free(playlist.songs[i]);
}
playlist.idToPosition[playlist.positionToId[i]] = -1; playlist.idToPosition[playlist.positionToId[i]] = -1;
playlist.songs[i] = NULL; playlist.songs[i] = NULL;
@ -670,8 +672,10 @@ enum playlist_result deleteFromPlaylist(unsigned song)
|| playlist.order[playlist.current] == song)) || playlist.order[playlist.current] == song))
clearPlayerQueue(); clearPlayerQueue();
if (!song_in_database(playlist.songs[song])) if (!song_in_database(playlist.songs[song])) {
pc_song_deleted(playlist.songs[song]);
song_free(playlist.songs[song]); song_free(playlist.songs[song]);
}
playlist.idToPosition[playlist.positionToId[song]] = -1; playlist.idToPosition[playlist.positionToId[song]] = -1;
@ -738,6 +742,8 @@ deleteASongFromPlaylist(const struct song *song)
for (unsigned i = 0; i < playlist.length; i++) for (unsigned i = 0; i < playlist.length; i++)
if (song == playlist.songs[i]) if (song == playlist.songs[i])
deleteFromPlaylist(i); deleteFromPlaylist(i);
pc_song_deleted(song);
} }
void stopPlaylist(void) void stopPlaylist(void)