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

Merge tag 'release-0.17.6'

Browse Source
This commit is contained in:
Max Kellermann
2013-10-14 21:40:56 +02:00
parent 17c6db6c33 681352ac3b
commit 8cf2f52f7a
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/PlaylistSave.cxx
View File

@@ -33,6 +33,8 @@
#include <glib.h>
#include <string.h>
void
playlist_print_song(FILE *file, const Song *song)
{
@@ -114,6 +116,14 @@ playlist_load_spl(struct playlist *playlist, struct player_control *pc,
for (unsigned i = start_index; i < end_index; ++i) {
const auto &uri_utf8 = contents[i];
if (memcmp(uri_utf8.c_str(), "file:///", 8) == 0) {
const char *path_utf8 = uri_utf8.c_str() + 7;
if (playlist->AppendFile(*pc, path_utf8) != PLAYLIST_RESULT_SUCCESS)
g_warning("can't add file \"%s\"", path_utf8);
continue;
}
if ((playlist->AppendURI(*pc, uri_utf8.c_str())) != PLAYLIST_RESULT_SUCCESS) {
/* for windows compatibility, convert slashes */
char *temp2 = g_strdup(uri_utf8.c_str());