1 files changed, 10 insertions, 119 deletions

diff --git a/src/songvec.c b/src/song_sort.c
index 38bcbac88..397d2c7a9 100644
--- a/src/songvec.c
+++ b/src/song_sort.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2012 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,18 +18,17 @@
  */
 
 #include "config.h"
-#include "songvec.h"
+#include "song_sort.h"
 #include "song.h"
+#include "util/list.h"
+#include "util/list_sort.h"
 #include "tag.h"
 
 #include <glib.h>
 
 #include <assert.h>
-#include <string.h>
 #include <stdlib.h>
 
-static GMutex *nr_lock = NULL;
-
 static const char *
 tag_get_value_checked(const struct tag *tag, enum tag_type type)
 {
@@ -89,10 +88,11 @@ compare_tag_item(const struct tag *a, const struct tag *b, enum tag_type type)
 }
 
 /* Only used for sorting/searchin a songvec, not general purpose compares */
-static int songvec_cmp(const void *s1, const void *s2)
+static int
+song_cmp(G_GNUC_UNUSED void *priv, struct list_head *_a, struct list_head *_b)
 {
-	const struct song *a = ((const struct song * const *)s1)[0];
-	const struct song *b = ((const struct song * const *)s2)[0];
+	const struct song *a = (const struct song *)_a;
+	const struct song *b = (const struct song *)_b;
 	int ret;
 
 	/* first sort by album */
@@ -114,117 +114,8 @@ static int songvec_cmp(const void *s1, const void *s2)
 	return g_utf8_collate(a->uri, b->uri);
 }
 
-static size_t sv_size(const struct songvec *sv)
-{
-	return sv->nr * sizeof(struct song *);
-}
-
-void songvec_init(void)
-{
-	g_assert(nr_lock == NULL);
-	nr_lock = g_mutex_new();
-}
-
-void songvec_deinit(void)
-{
-	g_assert(nr_lock != NULL);
-	g_mutex_free(nr_lock);
-	nr_lock = NULL;
-}
-
-void songvec_sort(struct songvec *sv)
-{
-	g_mutex_lock(nr_lock);
-	qsort(sv->base, sv->nr, sizeof(struct song *), songvec_cmp);
-	g_mutex_unlock(nr_lock);
-}
-
-struct song *
-songvec_find(const struct songvec *sv, const char *uri)
-{
-	int i;
-	struct song *ret = NULL;
-
-	g_mutex_lock(nr_lock);
-	for (i = sv->nr; --i >= 0; ) {
-		if (strcmp(sv->base[i]->uri, uri))
-			continue;
-		ret = sv->base[i];
-		break;
-	}
-	g_mutex_unlock(nr_lock);
-	return ret;
-}
-
-int
-songvec_delete(struct songvec *sv, const struct song *del)
-{
-	size_t i;
-
-	g_mutex_lock(nr_lock);
-	for (i = 0; i < sv->nr; ++i) {
-		if (sv->base[i] != del)
-			continue;
-		/* we _don't_ call song_free() here */
-		if (!--sv->nr) {
-			g_free(sv->base);
-			sv->base = NULL;
-		} else {
-			memmove(&sv->base[i], &sv->base[i + 1],
-				(sv->nr - i) * sizeof(struct song *));
-			sv->base = g_realloc(sv->base, sv_size(sv));
-		}
-		g_mutex_unlock(nr_lock);
-		return i;
-	}
-	g_mutex_unlock(nr_lock);
-
-	return -1; /* not found */
-}
-
 void
-songvec_add(struct songvec *sv, struct song *add)
-{
-	g_mutex_lock(nr_lock);
-	++sv->nr;
-	sv->base = g_realloc(sv->base, sv_size(sv));
-	sv->base[sv->nr - 1] = add;
-	g_mutex_unlock(nr_lock);
-}
-
-void songvec_destroy(struct songvec *sv)
-{
-	g_mutex_lock(nr_lock);
-	sv->nr = 0;
-	g_mutex_unlock(nr_lock);
-
-	g_free(sv->base);
-	sv->base = NULL;
-}
-
-int
-songvec_for_each(const struct songvec *sv,
-		 int (*fn)(struct song *, void *), void *arg)
+song_list_sort(struct list_head *songs)
 {
-	size_t i;
-	size_t prev_nr;
-
-	g_mutex_lock(nr_lock);
-	for (i = 0; i < sv->nr; ) {
-		struct song *song = sv->base[i];
-
-		assert(song);
-		assert(*song->uri);
-
-		prev_nr = sv->nr;
-		g_mutex_unlock(nr_lock); /* fn() may block */
-		if (fn(song, arg) < 0)
-			return -1;
-		g_mutex_lock(nr_lock); /* sv->nr may change in fn() */
-		if (prev_nr == sv->nr)
-			++i;
-	}
-	g_mutex_unlock(nr_lock);
-
-	return 0;
+	list_sort(NULL, songs, song_cmp);
 }