5 files changed, 59 insertions, 66 deletions

diff --git a/src/directory.c b/src/directory.c
index 16951dd30..1db1c862a 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -775,7 +775,6 @@ static int addToDirectory(Directory * directory, char * shortname, char * name)
 
 void closeMp3Directory() {
 	freeDirectory(mp3rootDirectory);
-	destroyTagTracker();
 }
 
 static Directory * findSubDirectory(Directory * directory,char * name) {
diff --git a/src/list.c b/src/list.c
index dc32e9c55..e681054fa 100644
--- a/src/list.c
+++ b/src/list.c
@@ -195,7 +195,7 @@ int insertInListWithoutKey(List * list, void * data) {
 
 /* if _key_ is not found, *_node_ is assigned to the node before which
 	the info would be found */
-static int findNodeInList(List * list, char * key, ListNode ** node, int * pos) {
+int findNodeInList(List * list, char * key, ListNode ** node, int * pos) {
 	long high;
 	long low;
 	long cur;
diff --git a/src/list.h b/src/list.h
index 6d5f5e0c7..ec72561a4 100644
--- a/src/list.h
+++ b/src/list.h
@@ -97,6 +97,9 @@ void deleteNodeFromList(List * list,ListNode * node);
  */
 int findInList(List * list, char * key, void ** data);
 
+/* if _key_ is not found, *_node_ is assigned to the node before which
+	the info would be found */
+int findNodeInList(List * list, char * key, ListNode ** node, int * pos);
 
 /* frees memory malloc'd for list and its nodes
  *  _list_ -> List to be free'd
diff --git a/src/tagTracker.c b/src/tagTracker.c
index 2d361fef0..14efb104b 100644
--- a/src/tagTracker.c
+++ b/src/tagTracker.c
@@ -18,13 +18,12 @@
 
 #include "tagTracker.h"
 
+#include "list.h"
 #include "log.h"
 
-#include <glib/gtree.h>
 #include <assert.h>
-#include <stdlib.h>
 
-static GTree * tagLists[TAG_NUM_OF_ITEM_TYPES] =
+static List * tagLists[TAG_NUM_OF_ITEM_TYPES] =
 {
 	NULL,
 	NULL,
@@ -40,124 +39,117 @@ typedef struct tagTrackerItem {
 	mpd_sint8 visited;
 } TagTrackerItem;
 
-static int keyCompare(const void *a, const void *b, void *data) {
-	return strcmp(a,b);
-}
-
 char * getTagItemString(int type, char * string) {
-	TagTrackerItem * item;
-	TagTrackerItem ** itemPointer = &item;
-	char *key;
-	char **keyPointer = &key;
+	ListNode * node;
+	int pos;
 
 	if(tagLists[type] == NULL) {
-		tagLists[type] = g_tree_new_full(keyCompare, NULL, free, free);
+		tagLists[type] = makeList(free, 1);
+		sortList(tagLists[type]);
 	}
 
-	if((TagTrackerItem *)g_tree_lookup_extended(tagLists[type], string, (void**)keyPointer, (void**)itemPointer )) {
-		item->count++;
+	if(findNodeInList(tagLists[type], string, &node, &pos)) {
+		((TagTrackerItem *)node->data)->count++;
 	}
 	else {
-		item = malloc(sizeof(TagTrackerItem));
+		TagTrackerItem * item = malloc(sizeof(TagTrackerItem));
 		item->count = 1;
 		item->visited = 0;
-		key = strdup(string);
-		g_tree_insert(tagLists[type], key, item);
+		node = insertInListBeforeNode(tagLists[type], node, pos,
+				string, item);
 	}
 
-	return key;
+	return node->key;
 }
 
-
 void removeTagItemString(int type, char * string) {
-	TagTrackerItem *item;
+	ListNode * node;
+	int pos;
 
 	assert(string);
 
 	assert(tagLists[type]);
 	if(tagLists[type] == NULL) return;
 
-	if((item = g_tree_lookup(tagLists[type], string))) {
+	if(findNodeInList(tagLists[type], string, &node, &pos)) {
+		TagTrackerItem * item = node->data;
 		item->count--;
-		if(item->count <= 0) g_tree_remove(tagLists[type], string);
+		if(item->count <= 0) deleteNodeFromList(tagLists[type], node);
 	}
 
-/* why would this be done??? free it when mpd quits...
- 	if(tagLists[type]->numberOfNodes == 0) {
+	if(tagLists[type]->numberOfNodes == 0) {
 		freeList(tagLists[type]);
 		tagLists[type] = NULL;
 	}
-*/
-}
-
-void destroyTagTracker() {
-	int type;
-	for (type=0; type < TAG_NUM_OF_ITEM_TYPES; type ++)
-		if (tagLists[type])
-			g_tree_destroy(tagLists[type]);
 }
 
 int getNumberOfTagItems(int type) {
 	if(tagLists[type] == NULL) return 0;
 
-	return g_tree_nnodes(tagLists[type]);
+	return tagLists[type]->numberOfNodes;
 }
 
-static int calcSavedMemory(char *key, TagTrackerItem* value, int* sum) {
-	*sum -= sizeof(int) + 4*sizeof(void*); /* sizeof(_GTreeNode) */
-	*sum -= sizeof(TagTrackerItem);
-	*sum += (strlen(key)+1)*value->count;
-	return FALSE;
-}
-	
 void printMemorySavedByTagTracker() {
 	int i;
+	ListNode * node;
 	size_t sum = 0;
 
 	for(i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++) {
 		if(!tagLists[i]) continue;
 
-		sum -= 5*sizeof(void*);/* sizeof(_GTree) */
-		g_tree_foreach(tagLists[i], (GTraverseFunc)calcSavedMemory, &sum);
+		sum -= sizeof(List);
+
+		node = tagLists[i]->firstNode;
+
+		while(node != NULL) {
+			sum -= sizeof(ListNode);
+			sum -= sizeof(TagTrackerItem);
+			sum -= sizeof(node->key);
+			sum += (strlen(node->key)+1)*(*((int *)node->data));
+			node = node->nextNode;
+		}
 	}
 
 	DEBUG("saved memory from tags: %li\n", (long)sum);
 }
 
-static int resetVisitedFlag(char *key, TagTrackerItem *value, void *data) {
-	value->visited = 0;
-	return FALSE;
-}
-
 void resetVisitedFlagsInTagTracker(int type) {
+	ListNode * node;
 
 	if(!tagLists[type]) return;
 
-	g_tree_foreach(tagLists[type], (GTraverseFunc)resetVisitedFlag, NULL);
+	node = tagLists[type]->firstNode;
+
+	while(node) {
+		((TagTrackerItem *)node->data)->visited = 0;
+		node = node->nextNode;
+	}
 }
 
 void visitInTagTracker(int type, char * str) {
-	TagTrackerItem * item;
+	void * item;
 
 	if(!tagLists[type]) return;
 
-	if(!(item = g_tree_lookup(tagLists[type], str))) return;
-
-	item->visited = 1;
-}
-
-struct _PrintVisitedUserdata {
-	FILE *fp;
-	char *type;
-};
+	if(!findInList(tagLists[type], str, &item)) return;
 
-static int printVisitedFlag(char *key, TagTrackerItem* value, struct _PrintVisitedUserdata *data) {
-	if(value->visited) myfprintf(data->fp, "%s: %s\n", data->type, key);
-	return FALSE;
+	((TagTrackerItem *)item)->visited = 1;
 }
 
 void printVisitedInTagTracker(FILE * fp, int type) {
-	struct _PrintVisitedUserdata data = {fp, mpdTagItemKeys[type]};
+	ListNode * node;
+	TagTrackerItem * item;
+
 	if(!tagLists[type]) return;
-	g_tree_foreach( tagLists[type], (GTraverseFunc)printVisitedFlag, (void*)&data);
+
+	node = tagLists[type]->firstNode;
+
+	while(node) {
+		item = node->data;
+		if(item->visited) {
+			myfprintf(fp, "%s: %s\n", mpdTagItemKeys[type],
+					node->key);
+		}
+		node = node->nextNode;
+	}
 }
diff --git a/src/tagTracker.h b/src/tagTracker.h
index 51b195192..418ddf49e 100644
--- a/src/tagTracker.h
+++ b/src/tagTracker.h
@@ -24,7 +24,6 @@
 char * getTagItemString(int type, char * string);
 
 void removeTagItemString(int type, char * string);
-void destroyTagTracker();
 
 int getNumberOfTagItems(int type);