14 files changed, 1756 insertions, 0 deletions

diff --git a/src/playlist/asx_playlist_plugin.c b/src/playlist/asx_playlist_plugin.c
new file mode 100644
index 000000000..03a5edea6
--- /dev/null
+++ b/src/playlist/asx_playlist_plugin.c
@@ -0,0 +1,322 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "playlist/asx_playlist_plugin.h"
+#include "playlist_plugin.h"
+#include "input_stream.h"
+#include "song.h"
+#include "tag.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <string.h>
+
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "asx"
+
+/**
+ * This is the state object for the GLib XML parser.
+ */
+struct asx_parser {
+	/**
+	 * The list of songs (in reverse order because that's faster
+	 * while adding).
+	 */
+	GSList *songs;
+
+	/**
+	 * The current position in the XML file.
+	 */
+	enum {
+		ROOT, ENTRY,
+	} state;
+
+	/**
+	 * The current tag within the "entry" element.  This is only
+	 * valid if state==ENTRY.  TAG_NUM_OF_ITEM_TYPES means there
+	 * is no (known) tag.
+	 */
+	enum tag_type tag;
+
+	/**
+	 * The current song.  It is allocated after the "location"
+	 * element.
+	 */
+	struct song *song;
+};
+
+static const gchar *
+get_attribute(const gchar **attribute_names, const gchar **attribute_values,
+	      const gchar *name)
+{
+	for (unsigned i = 0; attribute_names[i] != NULL; ++i)
+		if (g_ascii_strcasecmp(attribute_names[i], name) == 0)
+			return attribute_values[i];
+
+	return NULL;
+}
+
+static void
+asx_start_element(G_GNUC_UNUSED GMarkupParseContext *context,
+		  const gchar *element_name,
+		  const gchar **attribute_names,
+		  const gchar **attribute_values,
+		  gpointer user_data, G_GNUC_UNUSED GError **error)
+{
+	struct asx_parser *parser = user_data;
+
+	switch (parser->state) {
+	case ROOT:
+		if (g_ascii_strcasecmp(element_name, "entry") == 0) {
+			parser->state = ENTRY;
+			parser->song = song_remote_new("asx:");
+			parser->tag = TAG_NUM_OF_ITEM_TYPES;
+		}
+
+		break;
+
+	case ENTRY:
+		if (g_ascii_strcasecmp(element_name, "ref") == 0) {
+			const gchar *href = get_attribute(attribute_names,
+							  attribute_values,
+							  "href");
+			if (href != NULL) {
+				/* create new song object, and copy
+				   the existing tag over; we cannot
+				   replace the existing song's URI,
+				   because that attribute is
+				   immutable */
+				struct song *song = song_remote_new(href);
+
+				if (parser->song != NULL) {
+					song->tag = parser->song->tag;
+					parser->song->tag = NULL;
+					song_free(parser->song);
+				}
+
+				parser->song = song;
+			}
+		} else if (g_ascii_strcasecmp(element_name, "author") == 0)
+			/* is that correct?  or should it be COMPOSER
+			   or PERFORMER? */
+			parser->tag = TAG_ARTIST;
+		else if (g_ascii_strcasecmp(element_name, "title") == 0)
+			parser->tag = TAG_TITLE;
+
+		break;
+	}
+}
+
+static void
+asx_end_element(G_GNUC_UNUSED GMarkupParseContext *context,
+		const gchar *element_name,
+		gpointer user_data, G_GNUC_UNUSED GError **error)
+{
+	struct asx_parser *parser = user_data;
+
+	switch (parser->state) {
+	case ROOT:
+		break;
+
+	case ENTRY:
+		if (g_ascii_strcasecmp(element_name, "entry") == 0) {
+			if (strcmp(parser->song->uri, "asx:") != 0)
+				parser->songs = g_slist_prepend(parser->songs,
+								parser->song);
+			else
+				song_free(parser->song);
+
+			parser->state = ROOT;
+		} else
+			parser->tag = TAG_NUM_OF_ITEM_TYPES;
+
+		break;
+	}
+}
+
+static void
+asx_text(G_GNUC_UNUSED GMarkupParseContext *context,
+	 const gchar *text, gsize text_len,
+	 gpointer user_data, G_GNUC_UNUSED GError **error)
+{
+	struct asx_parser *parser = user_data;
+
+	switch (parser->state) {
+	case ROOT:
+		break;
+
+	case ENTRY:
+		if (parser->tag != TAG_NUM_OF_ITEM_TYPES) {
+			if (parser->song->tag == NULL)
+				parser->song->tag = tag_new();
+			tag_add_item_n(parser->song->tag, parser->tag,
+				       text, text_len);
+		}
+
+		break;
+	}
+}
+
+static const GMarkupParser asx_parser = {
+	.start_element = asx_start_element,
+	.end_element = asx_end_element,
+	.text = asx_text,
+};
+
+static void
+song_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data)
+{
+	struct song *song = data;
+
+	song_free(song);
+}
+
+static void
+asx_parser_destroy(gpointer data)
+{
+	struct asx_parser *parser = data;
+
+	if (parser->state >= ENTRY)
+		song_free(parser->song);
+
+	g_slist_foreach(parser->songs, song_free_callback, NULL);
+	g_slist_free(parser->songs);
+}
+
+/*
+ * The playlist object
+ *
+ */
+
+struct asx_playlist {
+	struct playlist_provider base;
+
+	GSList *songs;
+};
+
+static struct playlist_provider *
+asx_open_stream(struct input_stream *is)
+{
+	struct asx_parser parser = {
+		.songs = NULL,
+		.state = ROOT,
+	};
+	struct asx_playlist *playlist;
+	GMarkupParseContext *context;
+	char buffer[1024];
+	size_t nbytes;
+	bool success;
+	GError *error = NULL;
+
+	/* parse the ASX XML file */
+
+	context = g_markup_parse_context_new(&asx_parser,
+					     G_MARKUP_TREAT_CDATA_AS_TEXT,
+					     &parser, asx_parser_destroy);
+
+	while (true) {
+		nbytes = input_stream_read(is, buffer, sizeof(buffer), &error);
+		if (nbytes == 0) {
+			if (error != NULL) {
+				g_markup_parse_context_free(context);
+				g_warning("%s", error->message);
+				g_error_free(error);
+				return NULL;
+			}
+
+			break;
+		}
+
+		success = g_markup_parse_context_parse(context, buffer, nbytes,
+						       &error);
+		if (!success) {
+			g_warning("XML parser failed: %s", error->message);
+			g_error_free(error);
+			g_markup_parse_context_free(context);
+			return NULL;
+		}
+	}
+
+	success = g_markup_parse_context_end_parse(context, &error);
+	if (!success) {
+		g_warning("XML parser failed: %s", error->message);
+		g_error_free(error);
+		g_markup_parse_context_free(context);
+		return NULL;
+	}
+
+	/* create a #asx_playlist object from the parsed song list */
+
+	playlist = g_new(struct asx_playlist, 1);
+	playlist_provider_init(&playlist->base, &asx_playlist_plugin);
+	playlist->songs = g_slist_reverse(parser.songs);
+	parser.songs = NULL;
+
+	g_markup_parse_context_free(context);
+
+	return &playlist->base;
+}
+
+static void
+asx_close(struct playlist_provider *_playlist)
+{
+	struct asx_playlist *playlist = (struct asx_playlist *)_playlist;
+
+	g_slist_foreach(playlist->songs, song_free_callback, NULL);
+	g_slist_free(playlist->songs);
+	g_free(playlist);
+}
+
+static struct song *
+asx_read(struct playlist_provider *_playlist)
+{
+	struct asx_playlist *playlist = (struct asx_playlist *)_playlist;
+	struct song *song;
+
+	if (playlist->songs == NULL)
+		return NULL;
+
+	song = playlist->songs->data;
+	playlist->songs = g_slist_remove(playlist->songs, song);
+
+	return song;
+}
+
+static const char *const asx_suffixes[] = {
+	"asx",
+	NULL
+};
+
+static const char *const asx_mime_types[] = {
+	"video/x-ms-asf",
+	NULL
+};
+
+const struct playlist_plugin asx_playlist_plugin = {
+	.name = "asx",
+
+	.open_stream = asx_open_stream,
+	.close = asx_close,
+	.read = asx_read,
+
+	.suffixes = asx_suffixes,
+	.mime_types = asx_mime_types,
+};
diff --git a/src/playlist/asx_playlist_plugin.h b/src/playlist/asx_playlist_plugin.h
new file mode 100644
index 000000000..021e97f56
--- /dev/null
+++ b/src/playlist/asx_playlist_plugin.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_PLAYLIST_ASX_PLAYLIST_PLUGIN_H
+#define MPD_PLAYLIST_ASX_PLAYLIST_PLUGIN_H
+
+extern const struct playlist_plugin asx_playlist_plugin;
+
+#endif
diff --git a/src/playlist/cue_playlist_plugin.c b/src/playlist/cue_playlist_plugin.c
new file mode 100644
index 000000000..a9b596560
--- /dev/null
+++ b/src/playlist/cue_playlist_plugin.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "playlist/cue_playlist_plugin.h"
+#include "playlist_plugin.h"
+#include "tag.h"
+#include "song.h"
+#include "cue/cue_tag.h"
+
+#include <glib.h>
+#include <libcue/libcue.h>
+#include <assert.h>
+#include <string.h>
+
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "cue"
+
+struct cue_playlist {
+	struct playlist_provider base;
+
+	struct Cd *cd;
+
+	unsigned next;
+};
+
+static struct playlist_provider *
+cue_playlist_open_uri(const char *uri)
+{
+	struct cue_playlist *playlist;
+	FILE *file;
+	struct Cd *cd;
+
+	file = fopen(uri, "rt");
+	if (file == NULL)
+		return NULL;
+
+	cd = cue_parse_file(file);
+	fclose(file);
+	if (cd == NULL)
+		return NULL;
+
+	playlist = g_new(struct cue_playlist, 1);
+	playlist_provider_init(&playlist->base, &cue_playlist_plugin);
+	playlist->cd = cd;
+	playlist->next = 1;
+
+	return &playlist->base;
+}
+
+static void
+cue_playlist_close(struct playlist_provider *_playlist)
+{
+	struct cue_playlist *playlist = (struct cue_playlist *)_playlist;
+
+	cd_delete(playlist->cd);
+	g_free(playlist);
+}
+
+static struct song *
+cue_playlist_read(struct playlist_provider *_playlist)
+{
+	struct cue_playlist *playlist = (struct cue_playlist *)_playlist;
+	struct Track *track;
+	struct tag *tag;
+	const char *filename;
+	struct song *song;
+
+	track = cd_get_track(playlist->cd, playlist->next);
+	if (track == NULL)
+		return NULL;
+
+	tag = cue_tag(playlist->cd, playlist->next);
+	if (tag == NULL)
+		return NULL;
+
+	++playlist->next;
+
+	filename = track_get_filename(track);
+	if (*filename == 0 || filename[0] == '.' ||
+	    strchr(filename, '/') != NULL) {
+		/* unsafe characters found, bail out */
+		tag_free(tag);
+		return NULL;
+	}
+
+	song = song_remote_new(filename);
+	song->tag = tag;
+	song->start_ms = (track_get_start(track) * 1000) / 75;
+	song->end_ms = ((track_get_start(track) + track_get_length(track))
+			* 1000) / 75;
+
+	return song;
+}
+
+static const char *const cue_playlist_suffixes[] = {
+	"cue",
+	NULL
+};
+
+static const char *const cue_playlist_mime_types[] = {
+	"application/x-cue",
+	NULL
+};
+
+const struct playlist_plugin cue_playlist_plugin = {
+	.name = "cue",
+
+	.open_uri = cue_playlist_open_uri,
+	.close = cue_playlist_close,
+	.read = cue_playlist_read,
+
+	.suffixes = cue_playlist_suffixes,
+	.mime_types = cue_playlist_mime_types,
+};
diff --git a/src/playlist/cue_playlist_plugin.h b/src/playlist/cue_playlist_plugin.h
new file mode 100644
index 000000000..2b5319388
--- /dev/null
+++ b/src/playlist/cue_playlist_plugin.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_PLAYLIST_CUE_PLAYLIST_PLUGIN_H
+#define MPD_PLAYLIST_CUE_PLAYLIST_PLUGIN_H
+
+extern const struct playlist_plugin cue_playlist_plugin;
+
+#endif
diff --git a/src/playlist/extm3u_playlist_plugin.c b/src/playlist/extm3u_playlist_plugin.c
new file mode 100644
index 000000000..bd81ff9fb
--- /dev/null
+++ b/src/playlist/extm3u_playlist_plugin.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "playlist/extm3u_playlist_plugin.h"
+#include "playlist_plugin.h"
+#include "text_input_stream.h"
+#include "uri.h"
+#include "song.h"
+#include "tag.h"
+
+#include <glib.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+struct extm3u_playlist {
+	struct playlist_provider base;
+
+	struct text_input_stream *tis;
+};
+
+static struct playlist_provider *
+extm3u_open_stream(struct input_stream *is)
+{
+	struct extm3u_playlist *playlist;
+	const char *line;
+
+	playlist = g_new(struct extm3u_playlist, 1);
+	playlist->tis = text_input_stream_new(is);
+
+	line = text_input_stream_read(playlist->tis);
+	if (line == NULL || strcmp(line, "#EXTM3U") != 0) {
+		/* no EXTM3U header: fall back to the plain m3u
+		   plugin */
+		text_input_stream_free(playlist->tis);
+		g_free(playlist);
+		return NULL;
+	}
+
+	playlist_provider_init(&playlist->base, &extm3u_playlist_plugin);
+	return &playlist->base;
+}
+
+static void
+extm3u_close(struct playlist_provider *_playlist)
+{
+	struct extm3u_playlist *playlist = (struct extm3u_playlist *)_playlist;
+
+	text_input_stream_free(playlist->tis);
+	g_free(playlist);
+}
+
+/**
+ * Parse a EXTINF line.
+ *
+ * @param line the rest of the input line after the colon
+ */
+static struct tag *
+extm3u_parse_tag(const char *line)
+{
+	long duration;
+	char *endptr;
+	const char *name;
+	struct tag *tag;
+
+	duration = strtol(line, &endptr, 10);
+	if (endptr[0] != ',')
+		/* malformed line */
+		return NULL;
+
+	if (duration < 0)
+		/* 0 means unknown duration */
+		duration = 0;
+
+	name = g_strchug(endptr + 1);
+	if (*name == 0 && duration == 0)
+		/* no information available; don't allocate a tag
+		   object */
+		return NULL;
+
+	tag = tag_new();
+	tag->time = duration;
+
+	/* unfortunately, there is no real specification for the
+	   EXTM3U format, so we must assume that the string after the
+	   comma is opaque, and is just the song name*/
+	if (*name != 0)
+		tag_add_item(tag, TAG_NAME, name);
+
+	return tag;
+}
+
+static struct song *
+extm3u_read(struct playlist_provider *_playlist)
+{
+	struct extm3u_playlist *playlist = (struct extm3u_playlist *)_playlist;
+	struct tag *tag = NULL;
+	const char *line;
+	struct song *song;
+
+	do {
+		line = text_input_stream_read(playlist->tis);
+		if (line == NULL) {
+			if (tag != NULL)
+				tag_free(tag);
+			return NULL;
+		}
+
+		if (g_str_has_prefix(line, "#EXTINF:")) {
+			if (tag != NULL)
+				tag_free(tag);
+			tag = extm3u_parse_tag(line + 8);
+			continue;
+		}
+
+		while (*line != 0 && g_ascii_isspace(*line))
+			++line;
+	} while (line[0] == '#' || *line == 0);
+
+	song = song_remote_new(line);
+	song->tag = tag;
+	return song;
+}
+
+static const char *const extm3u_suffixes[] = {
+	"m3u",
+	NULL
+};
+
+static const char *const extm3u_mime_types[] = {
+	"audio/x-mpegurl",
+	NULL
+};
+
+const struct playlist_plugin extm3u_playlist_plugin = {
+	.name = "extm3u",
+
+	.open_stream = extm3u_open_stream,
+	.close = extm3u_close,
+	.read = extm3u_read,
+
+	.suffixes = extm3u_suffixes,
+	.mime_types = extm3u_mime_types,
+};
diff --git a/src/playlist/extm3u_playlist_plugin.h b/src/playlist/extm3u_playlist_plugin.h
new file mode 100644
index 000000000..07f18eafa
--- /dev/null
+++ b/src/playlist/extm3u_playlist_plugin.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_PLAYLIST_EXTM3U_PLAYLIST_PLUGIN_H
+#define MPD_PLAYLIST_EXTM3U_PLAYLIST_PLUGIN_H
+
+extern const struct playlist_plugin extm3u_playlist_plugin;
+
+#endif
diff --git a/src/playlist/lastfm_playlist_plugin.c b/src/playlist/lastfm_playlist_plugin.c
new file mode 100644
index 000000000..ec499925a
--- /dev/null
+++ b/src/playlist/lastfm_playlist_plugin.c
@@ -0,0 +1,314 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "playlist/lastfm_playlist_plugin.h"
+#include "playlist_plugin.h"
+#include "playlist_list.h"
+#include "conf.h"
+#include "uri.h"
+#include "song.h"
+#include "input_stream.h"
+#include "glib_compat.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <string.h>
+
+struct lastfm_playlist {
+	struct playlist_provider base;
+
+	struct input_stream is;
+
+	struct playlist_provider *xspf;
+};
+
+static struct {
+	char *user;
+	char *md5;
+} lastfm_config;
+
+static bool
+lastfm_init(const struct config_param *param)
+{
+	const char *user = config_get_block_string(param, "user", NULL);
+	const char *passwd = config_get_block_string(param, "password", NULL);
+
+	if (user == NULL || passwd == NULL) {
+		g_debug("disabling the last.fm playlist plugin "
+			"because account is not configured");
+		return false;
+	}
+
+	lastfm_config.user = g_uri_escape_string(user, NULL, false);
+
+#if GLIB_CHECK_VERSION(2,16,0)
+	if (strlen(passwd) != 32)
+		lastfm_config.md5 = g_compute_checksum_for_string(G_CHECKSUM_MD5,
+								  passwd, strlen(passwd));
+	else
+#endif
+		lastfm_config.md5 = g_strdup(passwd);
+
+	return true;
+}
+
+static void
+lastfm_finish(void)
+{
+	g_free(lastfm_config.user);
+	g_free(lastfm_config.md5);
+}
+
+/**
+ * Simple data fetcher.
+ * @param url path or url of data to fetch.
+ * @return data fetched, or NULL on error. Must be freed with g_free.
+ */
+static char *
+lastfm_get(const char *url)
+{
+	struct input_stream input_stream;
+	GError *error = NULL;
+	bool success;
+	int ret;
+	char buffer[4096];
+	size_t length = 0, nbytes;
+
+	success = input_stream_open(&input_stream, url, &error);
+	if (!success) {
+		if (error != NULL) {
+			g_warning("%s", error->message);
+			g_error_free(error);
+		}
+
+		return NULL;
+	}
+
+	while (!input_stream.ready) {
+		ret = input_stream_buffer(&input_stream, &error);
+		if (ret < 0) {
+			input_stream_close(&input_stream);
+			g_warning("%s", error->message);
+			g_error_free(error);
+			return NULL;
+		}
+	}
+
+	do {
+		nbytes = input_stream_read(&input_stream, buffer + length,
+					   sizeof(buffer) - length, &error);
+		if (nbytes == 0) {
+			if (error != NULL) {
+				g_warning("%s", error->message);
+				g_error_free(error);
+			}
+
+			if (input_stream_eof(&input_stream))
+				break;
+
+			/* I/O error */
+			input_stream_close(&input_stream);
+			return NULL;
+		}
+
+		length += nbytes;
+	} while (length < sizeof(buffer));
+
+	input_stream_close(&input_stream);
+	return g_strndup(buffer, length);
+}
+
+/**
+ * Ini-style value fetcher.
+ * @param response data through which to search.
+ * @param name name of value to search for.
+ * @return value for param name in param reponse or NULL on error. Free with g_free.
+ */
+static char *
+lastfm_find(const char *response, const char *name)
+{
+	size_t name_length = strlen(name);
+
+	while (true) {
+		const char *eol = strchr(response, '\n');
+		if (eol == NULL)
+			return NULL;
+
+		if (strncmp(response, name, name_length) == 0 &&
+		    response[name_length] == '=') {
+			response += name_length + 1;
+			return g_strndup(response, eol - response);
+		}
+
+		response = eol + 1;
+	}
+}
+
+static struct playlist_provider *
+lastfm_open_uri(const char *uri)
+{
+	struct lastfm_playlist *playlist;
+	GError *error = NULL;
+	char *p, *q, *response, *session;
+	bool success;
+
+	/* handshake */
+
+	p = g_strconcat("http://ws.audioscrobbler.com/radio/handshake.php?"
+			"version=1.1.1&platform=linux&"
+			"username=", lastfm_config.user, "&"
+			"passwordmd5=", lastfm_config.md5, "&"
+			"debug=0&partner=", NULL);
+	response = lastfm_get(p);
+	g_free(p);
+	if (response == NULL)
+		return NULL;
+
+	/* extract session id from response */
+
+	session = lastfm_find(response, "session");
+	g_free(response);
+	if (session == NULL) {
+		g_warning("last.fm handshake failed");
+		return NULL;
+	}
+
+	q = g_uri_escape_string(session, NULL, false);
+	g_free(session);
+	session = q;
+
+	g_debug("session='%s'", session);
+
+	/* "adjust" last.fm radio */
+
+	if (strlen(uri) > 9) {
+		char *escaped_uri;
+
+		escaped_uri = g_uri_escape_string(uri, NULL, false);
+
+		p = g_strconcat("http://ws.audioscrobbler.com/radio/adjust.php?"
+				"session=", session, "&url=", escaped_uri, "&debug=0",
+				NULL);
+		g_free(escaped_uri);
+
+		response = lastfm_get(p);
+		g_free(response);
+		g_free(p);
+
+		if (response == NULL) {
+			g_free(session);
+			return NULL;
+		}
+	}
+
+	/* create the playlist object */
+
+	playlist = g_new(struct lastfm_playlist, 1);
+	playlist_provider_init(&playlist->base, &lastfm_playlist_plugin);
+
+	/* open the last.fm playlist */
+
+	p = g_strconcat("http://ws.audioscrobbler.com/radio/xspf.php?"
+			"sk=", session, "&discovery=0&desktop=1.5.1.31879",
+			NULL);
+	g_free(session);
+
+	success = input_stream_open(&playlist->is, p, &error);
+	g_free(p);
+
+	if (!success) {
+		if (error != NULL) {
+			g_warning("Failed to load XSPF playlist: %s",
+				  error->message);
+			g_error_free(error);
+		} else
+			g_warning("Failed to load XSPF playlist");
+		g_free(playlist);
+		return NULL;
+	}
+
+	while (!playlist->is.ready) {
+		int ret = input_stream_buffer(&playlist->is, &error);
+		if (ret < 0) {
+			input_stream_close(&playlist->is);
+			g_free(playlist);
+			g_warning("%s", error->message);
+			g_error_free(error);
+			return NULL;
+		}
+
+		if (ret == 0)
+			/* nothing was buffered - wait */
+			g_usleep(10000);
+	}
+
+	/* last.fm does not send a MIME type, we have to fake it here
+	   :-( */
+	g_free(playlist->is.mime);
+	playlist->is.mime = g_strdup("application/xspf+xml");
+
+	/* parse the XSPF playlist */
+
+	playlist->xspf = playlist_list_open_stream(&playlist->is, NULL);
+	if (playlist->xspf == NULL) {
+		input_stream_close(&playlist->is);
+		g_free(playlist);
+		g_warning("Failed to parse XSPF playlist");
+		return NULL;
+	}
+
+	return &playlist->base;
+}
+
+static void
+lastfm_close(struct playlist_provider *_playlist)
+{
+	struct lastfm_playlist *playlist = (struct lastfm_playlist *)_playlist;
+
+	playlist_plugin_close(playlist->xspf);
+	input_stream_close(&playlist->is);
+	g_free(playlist);
+}
+
+static struct song *
+lastfm_read(struct playlist_provider *_playlist)
+{
+	struct lastfm_playlist *playlist = (struct lastfm_playlist *)_playlist;
+
+	return playlist_plugin_read(playlist->xspf);
+}
+
+static const char *const lastfm_schemes[] = {
+	"lastfm",
+	NULL
+};
+
+const struct playlist_plugin lastfm_playlist_plugin = {
+	.name = "lastfm",
+
+	.init = lastfm_init,
+	.finish = lastfm_finish,
+	.open_uri = lastfm_open_uri,
+	.close = lastfm_close,
+	.read = lastfm_read,
+
+	.schemes = lastfm_schemes,
+};
diff --git a/src/playlist/lastfm_playlist_plugin.h b/src/playlist/lastfm_playlist_plugin.h
new file mode 100644
index 000000000..871a4a043
--- /dev/null
+++ b/src/playlist/lastfm_playlist_plugin.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_PLAYLIST_LASTFM_PLAYLIST_PLUGIN_H
+#define MPD_PLAYLIST_LASTFM_PLAYLIST_PLUGIN_H
+
+extern const struct playlist_plugin lastfm_playlist_plugin;
+
+#endif
diff --git a/src/playlist/m3u_playlist_plugin.c b/src/playlist/m3u_playlist_plugin.c
new file mode 100644
index 000000000..dbabea2e6
--- /dev/null
+++ b/src/playlist/m3u_playlist_plugin.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "playlist/m3u_playlist_plugin.h"
+#include "playlist_plugin.h"
+#include "text_input_stream.h"
+#include "uri.h"
+#include "song.h"
+
+#include <glib.h>
+
+struct m3u_playlist {
+	struct playlist_provider base;
+
+	struct text_input_stream *tis;
+};
+
+static struct playlist_provider *
+m3u_open_stream(struct input_stream *is)
+{
+	struct m3u_playlist *playlist = g_new(struct m3u_playlist, 1);
+
+	playlist_provider_init(&playlist->base, &m3u_playlist_plugin);
+	playlist->tis = text_input_stream_new(is);
+
+	return &playlist->base;
+}
+
+static void
+m3u_close(struct playlist_provider *_playlist)
+{
+	struct m3u_playlist *playlist = (struct m3u_playlist *)_playlist;
+
+	text_input_stream_free(playlist->tis);
+	g_free(playlist);
+}
+
+static struct song *
+m3u_read(struct playlist_provider *_playlist)
+{
+	struct m3u_playlist *playlist = (struct m3u_playlist *)_playlist;
+	const char *line;
+
+	do {
+		line = text_input_stream_read(playlist->tis);
+		if (line == NULL)
+			return NULL;
+
+		while (*line != 0 && g_ascii_isspace(*line))
+			++line;
+	} while (line[0] == '#' || *line == 0);
+
+	return song_remote_new(line);
+}
+
+static const char *const m3u_suffixes[] = {
+	"m3u",
+	NULL
+};
+
+static const char *const m3u_mime_types[] = {
+	"audio/x-mpegurl",
+	NULL
+};
+
+const struct playlist_plugin m3u_playlist_plugin = {
+	.name = "m3u",
+
+	.open_stream = m3u_open_stream,
+	.close = m3u_close,
+	.read = m3u_read,
+
+	.suffixes = m3u_suffixes,
+	.mime_types = m3u_mime_types,
+};
diff --git a/src/playlist/m3u_playlist_plugin.h b/src/playlist/m3u_playlist_plugin.h
new file mode 100644
index 000000000..3cb4b8874
--- /dev/null
+++ b/src/playlist/m3u_playlist_plugin.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_PLAYLIST_M3U_PLAYLIST_PLUGIN_H
+#define MPD_PLAYLIST_M3U_PLAYLIST_PLUGIN_H
+
+extern const struct playlist_plugin m3u_playlist_plugin;
+
+#endif
diff --git a/src/playlist/pls_playlist_plugin.c b/src/playlist/pls_playlist_plugin.c
new file mode 100644
index 000000000..30c62b76e
--- /dev/null
+++ b/src/playlist/pls_playlist_plugin.c
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "playlist/pls_playlist_plugin.h"
+#include "playlist_plugin.h"
+#include "input_stream.h"
+#include "uri.h"
+#include "song.h"
+#include "tag.h"
+#include <glib.h>
+
+struct pls_playlist {
+	struct playlist_provider base;
+
+	GSList *songs;
+};
+
+static void pls_parser(GKeyFile *keyfile, struct pls_playlist *playlist)
+{
+	gchar *key;
+	gchar *value;
+	int length;
+	GError *error = NULL;
+	int num_entries = g_key_file_get_integer(keyfile, "playlist",
+						 "NumberOfEntries", &error);
+	if (error) {
+		g_debug("Invalid PLS file: '%s'", error->message);
+		g_error_free(error);
+		error = NULL;
+
+		/* Hack to work around shoutcast failure to comform to spec */
+		num_entries = g_key_file_get_integer(keyfile, "playlist",
+						     "numberofentries", &error);
+		if (error) {
+			g_error_free(error);
+			error = NULL;
+		}
+	}
+
+	while (num_entries > 0) {
+		struct song *song;
+		key = g_strdup_printf("File%i", num_entries);
+		value = g_key_file_get_string(keyfile, "playlist", key,
+					      &error);
+		if(error) {
+			g_debug("Invalid PLS entry %s: '%s'",key, error->message);
+			g_error_free(error);
+			g_free(key);
+			return;
+		}
+		g_free(key);
+
+		song = song_remote_new(value);
+		g_free(value);
+
+		key = g_strdup_printf("Title%i", num_entries);
+		value = g_key_file_get_string(keyfile, "playlist", key,
+					      &error);
+		g_free(key);
+		if(error == NULL && value){
+			if (song->tag == NULL)
+				song->tag = tag_new();
+			tag_add_item(song->tag,TAG_TITLE, value);
+		}
+		/* Ignore errors? Most likely value not present */
+		if(error) g_error_free(error);
+		error = NULL;
+		g_free(value);
+
+		key = g_strdup_printf("Length%i", num_entries);
+		length = g_key_file_get_integer(keyfile, "playlist", key,
+						&error);
+		g_free(key);
+		if(error == NULL && length > 0){
+			if (song->tag == NULL)
+				song->tag = tag_new();
+			song->tag->time = length;
+		}
+		/* Ignore errors? Most likely value not present */
+		if(error) g_error_free(error);
+		error = NULL;
+
+		playlist->songs = g_slist_prepend(playlist->songs, song);
+		num_entries--;
+	}
+
+}
+
+static struct playlist_provider *
+pls_open_stream(struct input_stream *is)
+{
+	GError *error = NULL;
+	size_t nbytes;
+	char buffer[1024];
+	bool success;
+	GKeyFile *keyfile;
+	struct pls_playlist *playlist;
+	GString *kf_data = g_string_new("");
+
+	do {
+		nbytes = input_stream_read(is, buffer, sizeof(buffer), &error);
+		if (nbytes == 0) {
+			if (error != NULL) {
+				g_string_free(kf_data, TRUE);
+				g_warning("%s", error->message);
+				g_error_free(error);
+				return NULL;
+			}
+
+			break;
+		}
+
+		kf_data = g_string_append_len(kf_data, buffer,nbytes);
+		/* Limit to 64k */
+	} while(kf_data->len < 65536);
+
+	if (kf_data->len == 0) {
+		g_warning("KeyFile parser failed: No Data");
+		g_string_free(kf_data, TRUE);
+		return NULL;
+	}
+
+	keyfile = g_key_file_new();
+	success = g_key_file_load_from_data(keyfile,
+					    kf_data->str, kf_data->len,
+					    G_KEY_FILE_NONE, &error);
+
+	g_string_free(kf_data, TRUE);
+
+	if (!success) {
+		g_warning("KeyFile parser failed: %s", error->message);
+		g_error_free(error);
+		g_key_file_free(keyfile);
+		return NULL;
+	}
+
+	playlist = g_new(struct pls_playlist, 1);
+	playlist_provider_init(&playlist->base, &pls_playlist_plugin);
+	playlist->songs = NULL;
+
+	pls_parser(keyfile, playlist);
+
+	g_key_file_free(keyfile);
+	return &playlist->base;
+}
+
+
+static void
+song_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data)
+{
+	struct song *song = data;
+
+	song_free(song);
+}
+
+static void
+pls_close(struct playlist_provider *_playlist)
+{
+	struct pls_playlist *playlist = (struct pls_playlist *)_playlist;
+
+	g_slist_foreach(playlist->songs, song_free_callback, NULL);
+	g_slist_free(playlist->songs);
+
+	g_free(playlist);
+
+}
+
+static struct song *
+pls_read(struct playlist_provider *_playlist)
+{
+	struct pls_playlist *playlist = (struct pls_playlist *)_playlist;
+	struct song *song;
+
+	if (playlist->songs == NULL)
+		return NULL;
+
+	song = playlist->songs->data;
+	playlist->songs = g_slist_remove(playlist->songs, song);
+
+	return song;
+}
+
+static const char *const pls_suffixes[] = {
+	"pls",
+	NULL
+};
+
+static const char *const pls_mime_types[] = {
+	"audio/x-scpls",
+	NULL
+};
+
+const struct playlist_plugin pls_playlist_plugin = {
+	.name = "pls",
+
+	.open_stream = pls_open_stream,
+	.close = pls_close,
+	.read = pls_read,
+
+	.suffixes = pls_suffixes,
+	.mime_types = pls_mime_types,
+};
diff --git a/src/playlist/pls_playlist_plugin.h b/src/playlist/pls_playlist_plugin.h
new file mode 100644
index 000000000..7bf1951b8
--- /dev/null
+++ b/src/playlist/pls_playlist_plugin.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_PLAYLIST_PLS_PLAYLIST_PLUGIN_H
+#define MPD_PLAYLIST_PLS_PLAYLIST_PLUGIN_H
+
+extern const struct playlist_plugin pls_playlist_plugin;
+
+#endif
diff --git a/src/playlist/xspf_playlist_plugin.c b/src/playlist/xspf_playlist_plugin.c
new file mode 100644
index 000000000..a36463500
--- /dev/null
+++ b/src/playlist/xspf_playlist_plugin.c
@@ -0,0 +1,342 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "playlist/xspf_playlist_plugin.h"
+#include "playlist_plugin.h"
+#include "input_stream.h"
+#include "uri.h"
+#include "song.h"
+#include "tag.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <string.h>
+
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "xspf"
+
+/**
+ * This is the state object for the GLib XML parser.
+ */
+struct xspf_parser {
+	/**
+	 * The list of songs (in reverse order because that's faster
+	 * while adding).
+	 */
+	GSList *songs;
+
+	/**
+	 * The current position in the XML file.
+	 */
+	enum {
+		ROOT, PLAYLIST, TRACKLIST, TRACK,
+		LOCATION,
+	} state;
+
+	/**
+	 * The current tag within the "track" element.  This is only
+	 * valid if state==TRACK.  TAG_NUM_OF_ITEM_TYPES means there
+	 * is no (known) tag.
+	 */
+	enum tag_type tag;
+
+	/**
+	 * The current song.  It is allocated after the "location"
+	 * element.
+	 */
+	struct song *song;
+};
+
+static void
+xspf_start_element(G_GNUC_UNUSED GMarkupParseContext *context,
+		   const gchar *element_name,
+		   G_GNUC_UNUSED const gchar **attribute_names,
+		   G_GNUC_UNUSED const gchar **attribute_values,
+		   gpointer user_data, G_GNUC_UNUSED GError **error)
+{
+	struct xspf_parser *parser = user_data;
+
+	switch (parser->state) {
+	case ROOT:
+		if (strcmp(element_name, "playlist") == 0)
+			parser->state = PLAYLIST;
+
+		break;
+
+	case PLAYLIST:
+		if (strcmp(element_name, "trackList") == 0)
+			parser->state = TRACKLIST;
+
+		break;
+
+	case TRACKLIST:
+		if (strcmp(element_name, "track") == 0) {
+			parser->state = TRACK;
+			parser->song = NULL;
+			parser->tag = TAG_NUM_OF_ITEM_TYPES;
+		}
+
+		break;
+
+	case TRACK:
+		if (strcmp(element_name, "location") == 0)
+			parser->state = LOCATION;
+		else if (strcmp(element_name, "title") == 0)
+			parser->tag = TAG_TITLE;
+		else if (strcmp(element_name, "creator") == 0)
+			/* TAG_COMPOSER would be more correct
+			   according to the XSPF spec */
+			parser->tag = TAG_ARTIST;
+		else if (strcmp(element_name, "annotation") == 0)
+			parser->tag = TAG_COMMENT;
+		else if (strcmp(element_name, "album") == 0)
+			parser->tag = TAG_ALBUM;
+		else if (strcmp(element_name, "trackNum") == 0)
+			parser->tag = TAG_TRACK;
+
+		break;
+
+	case LOCATION:
+		break;
+	}
+}
+
+static void
+xspf_end_element(G_GNUC_UNUSED GMarkupParseContext *context,
+		 const gchar *element_name,
+		 gpointer user_data, G_GNUC_UNUSED GError **error)
+{
+	struct xspf_parser *parser = user_data;
+
+	switch (parser->state) {
+	case ROOT:
+		break;
+
+	case PLAYLIST:
+		if (strcmp(element_name, "playlist") == 0)
+			parser->state = ROOT;
+
+		break;
+
+	case TRACKLIST:
+		if (strcmp(element_name, "tracklist") == 0)
+			parser->state = PLAYLIST;
+
+		break;
+
+	case TRACK:
+		if (strcmp(element_name, "track") == 0) {
+			if (parser->song != NULL)
+				parser->songs = g_slist_prepend(parser->songs,
+								parser->song);
+
+			parser->state = TRACKLIST;
+		} else
+			parser->tag = TAG_NUM_OF_ITEM_TYPES;
+
+		break;
+
+	case LOCATION:
+		parser->state = TRACK;
+		break;
+	}
+}
+
+static void
+xspf_text(G_GNUC_UNUSED GMarkupParseContext *context,
+	  const gchar *text, gsize text_len,
+	  gpointer user_data, G_GNUC_UNUSED GError **error)
+{
+	struct xspf_parser *parser = user_data;
+
+	switch (parser->state) {
+	case ROOT:
+	case PLAYLIST:
+	case TRACKLIST:
+		break;
+
+	case TRACK:
+		if (parser->song != NULL &&
+		    parser->tag != TAG_NUM_OF_ITEM_TYPES) {
+			if (parser->song->tag == NULL)
+				parser->song->tag = tag_new();
+			tag_add_item_n(parser->song->tag, parser->tag,
+				       text, text_len);
+		}
+
+		break;
+
+	case LOCATION:
+		if (parser->song == NULL) {
+			char *uri = g_strndup(text, text_len);
+			parser->song = song_remote_new(uri);
+			g_free(uri);
+		}
+
+		break;
+	}
+}
+
+static const GMarkupParser xspf_parser = {
+	.start_element = xspf_start_element,
+	.end_element = xspf_end_element,
+	.text = xspf_text,
+};
+
+static void
+song_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data)
+{
+	struct song *song = data;
+
+	song_free(song);
+}
+
+static void
+xspf_parser_destroy(gpointer data)
+{
+	struct xspf_parser *parser = data;
+
+	if (parser->state >= TRACK && parser->song != NULL)
+		song_free(parser->song);
+
+	g_slist_foreach(parser->songs, song_free_callback, NULL);
+	g_slist_free(parser->songs);
+}
+
+/*
+ * The playlist object
+ *
+ */
+
+struct xspf_playlist {
+	struct playlist_provider base;
+
+	GSList *songs;
+};
+
+static struct playlist_provider *
+xspf_open_stream(struct input_stream *is)
+{
+	struct xspf_parser parser = {
+		.songs = NULL,
+		.state = ROOT,
+	};
+	struct xspf_playlist *playlist;
+	GMarkupParseContext *context;
+	char buffer[1024];
+	size_t nbytes;
+	bool success;
+	GError *error = NULL;
+
+	/* parse the XSPF XML file */
+
+	context = g_markup_parse_context_new(&xspf_parser,
+					     G_MARKUP_TREAT_CDATA_AS_TEXT,
+					     &parser, xspf_parser_destroy);
+
+	while (true) {
+		nbytes = input_stream_read(is, buffer, sizeof(buffer), &error);
+		if (nbytes == 0) {
+			if (error != NULL) {
+				g_markup_parse_context_free(context);
+				g_warning("%s", error->message);
+				g_error_free(error);
+				return NULL;
+			}
+
+			break;
+		}
+
+		success = g_markup_parse_context_parse(context, buffer, nbytes,
+						       &error);
+		if (!success) {
+			g_warning("XML parser failed: %s", error->message);
+			g_error_free(error);
+			g_markup_parse_context_free(context);
+			return NULL;
+		}
+	}
+
+	success = g_markup_parse_context_end_parse(context, &error);
+	if (!success) {
+		g_warning("XML parser failed: %s", error->message);
+		g_error_free(error);
+		g_markup_parse_context_free(context);
+		return NULL;
+	}
+
+	/* create a #xspf_playlist object from the parsed song list */
+
+	playlist = g_new(struct xspf_playlist, 1);
+	playlist_provider_init(&playlist->base, &xspf_playlist_plugin);
+	playlist->songs = g_slist_reverse(parser.songs);
+	parser.songs = NULL;
+
+	g_markup_parse_context_free(context);
+
+	return &playlist->base;
+}
+
+static void
+xspf_close(struct playlist_provider *_playlist)
+{
+	struct xspf_playlist *playlist = (struct xspf_playlist *)_playlist;
+
+	g_slist_foreach(playlist->songs, song_free_callback, NULL);
+	g_slist_free(playlist->songs);
+	g_free(playlist);
+}
+
+static struct song *
+xspf_read(struct playlist_provider *_playlist)
+{
+	struct xspf_playlist *playlist = (struct xspf_playlist *)_playlist;
+	struct song *song;
+
+	if (playlist->songs == NULL)
+		return NULL;
+
+	song = playlist->songs->data;
+	playlist->songs = g_slist_remove(playlist->songs, song);
+
+	return song;
+}
+
+static const char *const xspf_suffixes[] = {
+	"xspf",
+	NULL
+};
+
+static const char *const xspf_mime_types[] = {
+	"application/xspf+xml",
+	NULL
+};
+
+const struct playlist_plugin xspf_playlist_plugin = {
+	.name = "xspf",
+
+	.open_stream = xspf_open_stream,
+	.close = xspf_close,
+	.read = xspf_read,
+
+	.suffixes = xspf_suffixes,
+	.mime_types = xspf_mime_types,
+};
diff --git a/src/playlist/xspf_playlist_plugin.h b/src/playlist/xspf_playlist_plugin.h
new file mode 100644
index 000000000..c2c36fbed
--- /dev/null
+++ b/src/playlist/xspf_playlist_plugin.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_PLAYLIST_XSPF_PLAYLIST_PLUGIN_H
+#define MPD_PLAYLIST_XSPF_PLAYLIST_PLUGIN_H
+
+extern const struct playlist_plugin xspf_playlist_plugin;
+
+#endif