diff options
Diffstat (limited to '')
| -rw-r--r-- | src/PlaylistQueue.cxx (renamed from src/playlist_queue.c) | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/playlist_queue.c b/src/PlaylistQueue.cxx index aada94984..e75720315 100644 --- a/src/playlist_queue.c +++ b/src/PlaylistQueue.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,13 +18,16 @@ */ #include "config.h" -#include "playlist_queue.h" +#include "PlaylistQueue.hxx" #include "playlist_plugin.h" -#include "playlist_any.h" -#include "playlist_song.h" -#include "playlist.h" +#include "PlaylistAny.hxx" +#include "PlaylistSong.hxx" +#include "Playlist.hxx" + +extern "C" { #include "song.h" #include "input_stream.h" +} enum playlist_result playlist_load_into_queue(const char *uri, struct playlist_provider *source, @@ -41,8 +44,7 @@ playlist_load_into_queue(const char *uri, struct playlist_provider *source, ++i) { if (i < start_index) { /* skip songs before the start index */ - if (!song_in_database(song)) - song_free(song); + song_free(song); continue; } @@ -51,9 +53,8 @@ playlist_load_into_queue(const char *uri, struct playlist_provider *source, continue; result = playlist_append_song(dest, pc, song, NULL); + song_free(song); if (result != PLAYLIST_RESULT_SUCCESS) { - if (!song_in_database(song)) - song_free(song); g_free(base_uri); return result; } |