1 files changed, 60 insertions, 33 deletions

diff --git a/src/queue_save.c b/src/queue_save.c
index 9a5a0e30f..afe04ca2d 100644
--- a/src/queue_save.c
+++ b/src/queue_save.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,63 +17,90 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "queue_save.h"
 #include "queue.h"
 #include "song.h"
 #include "uri.h"
 #include "database.h"
+#include "song_save.h"
 
 #include <stdlib.h>
 
-void
-queue_save(FILE *fp, const struct queue *queue)
+static void
+queue_save_database_song(FILE *fp, int idx, const struct song *song)
 {
-	for (unsigned i = 0; i < queue_length(queue); i++) {
-		const struct song *song = queue_get(queue, i);
-		char *uri = song_get_uri(song);
+	char *uri = song_get_uri(song);
 
-		fprintf(fp, "%i:%s\n", i, uri);
-		g_free(uri);
-	}
+	fprintf(fp, "%i:%s\n", idx, uri);
+	g_free(uri);
 }
 
-static struct song *
-get_song(const char *uri)
+static void
+queue_save_full_song(FILE *fp, const struct song *song)
 {
-	struct song *song;
+	song_save(fp, song);
+}
 
-	song = db_get_song(uri);
-	if (song != NULL)
-		return song;
+static void
+queue_save_song(FILE *fp, int idx, const struct song *song)
+{
+	if (song_in_database(song))
+		queue_save_database_song(fp, idx, song);
+	else
+		queue_save_full_song(fp, song);
+}
 
-	if (uri_has_scheme(uri))
-		return song_remote_new(uri);
+void
+queue_save(FILE *fp, const struct queue *queue)
+{
+	for (unsigned i = 0; i < queue_length(queue); i++)
+		queue_save_song(fp, i, queue_get(queue, i));
+}
 
-	return NULL;
+static struct song *
+get_song(const char *uri)
+{
+	return uri_has_scheme(uri)
+		? song_remote_new(uri)
+		: db_get_song(uri);
 }
 
-int
-queue_load_song(struct queue *queue, const char *line)
+void
+queue_load_song(FILE *fp, GString *buffer, const char *line,
+		struct queue *queue)
 {
-	long ret;
-	char *endptr;
 	struct song *song;
 
 	if (queue_is_full(queue))
-		return -1;
+		return;
 
-	ret = strtol(line, &endptr, 10);
-	if (ret < 0 || *endptr != ':' || endptr[1] == 0) {
-		g_warning("Malformed playlist line in state file");
-		return -1;
-	}
+	if (g_str_has_prefix(line, SONG_BEGIN)) {
+		const char *uri = line + sizeof(SONG_BEGIN) - 1;
+		if (!uri_has_scheme(uri) && !g_path_is_absolute(uri))
+			return;
 
-	line = endptr + 1;
+		GError *error = NULL;
+		song = song_load(fp, NULL, uri, buffer, &error);
+		if (song == NULL) {
+			g_warning("%s", error->message);
+			g_error_free(error);
+			return;
+		}
+	} else {
+		char *endptr;
+		long ret = strtol(line, &endptr, 10);
+		if (ret < 0 || *endptr != ':' || endptr[1] == 0) {
+			g_warning("Malformed playlist line in state file");
+			return;
+		}
 
-	song = get_song(line);
-	if (song == NULL)
-		return -1;
+		line = endptr + 1;
+
+		song = get_song(line);
+		if (song == NULL)
+			return;
+	}
 
 	queue_append(queue, song);
-	return ret;
 }