# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1169815925 0
# Node ID c67a7f2fd586b4ce3242a5a361c769624ee8cfbc
# Parent  34d48e5134193ec5e19d1cefc2bd46058f8cc932
Moved the glue functions to xmms-sid.c


diff -r 34d48e513419 -r c67a7f2fd586 src/xs_length.c
--- a/src/xs_length.c	Thu Jan 25 09:31:02 2007 +0000
+++ b/src/xs_length.c	Fri Jan 26 12:52:05 2007 +0000
@@ -22,7 +22,6 @@
 */
 #include "xs_length.h"
 #include "xs_support.h"
-#include "xs_config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -566,82 +565,3 @@
 
 	return pResult;
 }
-
-
-/*
- * These should be moved out of this module some day ...
- */
-static t_xs_sldb *xs_sldb_db = NULL;
-XS_MUTEX(xs_sldb_db);
-
-gint xs_songlen_init(void)
-{
-	XS_MUTEX_LOCK(xs_cfg);
-
-	if (!xs_cfg.songlenDBPath) {
-		XS_MUTEX_UNLOCK(xs_cfg);
-		return -1;
-	}
-
-	XS_MUTEX_LOCK(xs_sldb_db);
-
-	/* Check if already initialized */
-	if (xs_sldb_db)
-		xs_sldb_free(xs_sldb_db);
-
-	/* Allocate database */
-	xs_sldb_db = (t_xs_sldb *) g_malloc0(sizeof(t_xs_sldb));
-	if (!xs_sldb_db) {
-		XS_MUTEX_UNLOCK(xs_cfg);
-		XS_MUTEX_UNLOCK(xs_sldb_db);
-		return -2;
-	}
-
-	/* Read the database */
-	if (xs_sldb_read(xs_sldb_db, xs_cfg.songlenDBPath) != 0) {
-		xs_sldb_free(xs_sldb_db);
-		xs_sldb_db = NULL;
-		XS_MUTEX_UNLOCK(xs_cfg);
-		XS_MUTEX_UNLOCK(xs_sldb_db);
-		return -3;
-	}
-
-	/* Create index */
-	if (xs_sldb_index(xs_sldb_db) != 0) {
-		xs_sldb_free(xs_sldb_db);
-		xs_sldb_db = NULL;
-		XS_MUTEX_UNLOCK(xs_cfg);
-		XS_MUTEX_UNLOCK(xs_sldb_db);
-		return -4;
-	}
-
-	XS_MUTEX_UNLOCK(xs_cfg);
-	XS_MUTEX_UNLOCK(xs_sldb_db);
-	return 0;
-}
-
-
-void xs_songlen_close(void)
-{
-	XS_MUTEX_LOCK(xs_sldb_db);
-	xs_sldb_free(xs_sldb_db);
-	xs_sldb_db = NULL;
-	XS_MUTEX_UNLOCK(xs_sldb_db);
-}
-
-
-t_xs_sldb_node *xs_songlen_get(const gchar * pcFilename)
-{
-	t_xs_sldb_node *pResult;
-
-	XS_MUTEX_LOCK(xs_sldb_db);
-
-	if (xs_cfg.songlenDBEnable && xs_sldb_db)
-		pResult = xs_sldb_get(xs_sldb_db, pcFilename);
-	else
-		pResult = NULL;
-
-	XS_MUTEX_UNLOCK(xs_sldb_db);
-
-	return pResult;
-}
diff -r 34d48e513419 -r c67a7f2fd586 src/xs_length.h
--- a/src/xs_length.h	Thu Jan 25 09:31:02 2007 +0000
+++ b/src/xs_length.h	Fri Jan 26 12:52:05 2007 +0000
@@ -32,11 +32,6 @@
 void			xs_sldb_free(t_xs_sldb *);
 t_xs_sldb_node *	xs_sldb_get(t_xs_sldb *, const gchar *);
 
-
-gint			xs_songlen_init(void);
-void			xs_songlen_close(void);
-t_xs_sldb_node *	xs_songlen_get(const gchar *);
-
 #ifdef __cplusplus
 }
 #endif