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

load_file

This commit is contained in:
Max Kellermann 2013-10-14 20:54:05 +02:00
parent 3be63549c0
commit 7cbaf11dda
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,6 +1,8 @@
ver 0.17.6 (not yet released) ver 0.17.6 (not yet released)
* mixer: * mixer:
- alsa: fix busy loop when USB sound device gets unplugged - alsa: fix busy loop when USB sound device gets unplugged
* stored playlists:
- fix loading playlists with references to local files
ver 0.17.5 (2013/08/04) ver 0.17.5 (2013/08/04)
* protocol: * protocol:

11
src/playlist_save.c
View File

@ -32,6 +32,8 @@
#include <glib.h> #include <glib.h>
#include <string.h>
void void
playlist_print_song(FILE *file, const struct song *song) playlist_print_song(FILE *file, const struct song *song)
{ {
@ -128,6 +130,15 @@ playlist_load_spl(struct playlist *playlist, struct player_control *pc,
for (unsigned i = start_index; i < end_index; ++i) { for (unsigned i = start_index; i < end_index; ++i) {
const char *temp = g_ptr_array_index(list, i); const char *temp = g_ptr_array_index(list, i);
if (memcmp(temp, "file:///", 8) == 0) {
const char *path = temp + 7;
if (playlist_append_file(playlist, pc, path, NULL) != PLAYLIST_RESULT_SUCCESS)
g_warning("can't add file \"%s\"", path);
continue;
}
if ((playlist_append_uri(playlist, pc, temp, NULL)) != PLAYLIST_RESULT_SUCCESS) { if ((playlist_append_uri(playlist, pc, temp, NULL)) != PLAYLIST_RESULT_SUCCESS) {
/* for windows compatibility, convert slashes */ /* for windows compatibility, convert slashes */
char *temp2 = g_strdup(temp); char *temp2 = g_strdup(temp);