--- a/src/xs_slsup.c	Wed Mar 26 08:55:29 2008 +0200
+++ b/src/xs_slsup.c	Wed Apr 02 19:46:59 2008 +0300
@@ -24,10 +24,10 @@
 #include "xs_config.h"
 
 
-static t_xs_sldb *xs_sldb_db = NULL;
+static xs_sldb_t *xs_sldb_db = NULL;
 XS_MUTEX(xs_sldb_db);
 
-static t_xs_stildb *xs_stildb_db = NULL;
+static xs_stildb_t *xs_stildb_db = NULL;
 XS_MUTEX(xs_stildb_db);
 
 
@@ -49,7 +49,7 @@
 		xs_stildb_free(xs_stildb_db);
 
 	/* Allocate database */
-	xs_stildb_db = (t_xs_stildb *) g_malloc0(sizeof(t_xs_stildb));
+	xs_stildb_db = (xs_stildb_t *) g_malloc0(sizeof(xs_stildb_t));
 	if (!xs_stildb_db) {
 		XS_MUTEX_UNLOCK(xs_cfg);
 		XS_MUTEX_UNLOCK(xs_stildb_db);
@@ -89,9 +89,9 @@
 }
 
 
-t_xs_stil_node *xs_stil_get(gchar *pcFilename)
+stil_node_t *xs_stil_get(gchar *filename)
 {
-	t_xs_stil_node *pResult;
+	stil_node_t *result;
 	gchar *tmpFilename;
 
 	XS_MUTEX_LOCK(xs_stildb_db);
@@ -105,22 +105,22 @@
 				tmpFilename[0] = 0;
 
 			/* Remove HVSC location-prefix from filename */
-			tmpFilename = strstr(pcFilename, xs_cfg.hvscPath);
+			tmpFilename = strstr(filename, xs_cfg.hvscPath);
 			if (tmpFilename)
 				tmpFilename += strlen(xs_cfg.hvscPath);
 			else
-				tmpFilename = pcFilename;
+				tmpFilename = filename;
 		} else
-			tmpFilename = pcFilename;
+			tmpFilename = filename;
 
-		pResult = xs_stildb_get_node(xs_stildb_db, tmpFilename);
+		result = xs_stildb_get_node(xs_stildb_db, tmpFilename);
 	} else
-		pResult = NULL;
+		result = NULL;
 
 	XS_MUTEX_UNLOCK(xs_stildb_db);
 	XS_MUTEX_UNLOCK(xs_cfg);
 
-	return pResult;
+	return result;
 }
 
 
@@ -142,7 +142,7 @@
 		xs_sldb_free(xs_sldb_db);
 
 	/* Allocate database */
-	xs_sldb_db = (t_xs_sldb *) g_malloc0(sizeof(t_xs_sldb));
+	xs_sldb_db = (xs_sldb_t *) g_malloc0(sizeof(xs_sldb_t));
 	if (!xs_sldb_db) {
 		XS_MUTEX_UNLOCK(xs_cfg);
 		XS_MUTEX_UNLOCK(xs_sldb_db);
@@ -182,106 +182,106 @@
 }
 
 
-t_xs_sldb_node *xs_songlen_get(const gchar * pcFilename)
+sldb_node_t *xs_songlen_get(const gchar * filename)
 {
-	t_xs_sldb_node *pResult;
+	sldb_node_t *result;
 
 	XS_MUTEX_LOCK(xs_sldb_db);
 
 	if (xs_cfg.songlenDBEnable && xs_sldb_db)
-		pResult = xs_sldb_get(xs_sldb_db, pcFilename);
+		result = xs_sldb_get(xs_sldb_db, filename);
 	else
-		pResult = NULL;
+		result = NULL;
 
 	XS_MUTEX_UNLOCK(xs_sldb_db);
 
-	return pResult;
+	return result;
 }
 
 
 /* Allocate a new tune information structure
  */
-t_xs_tuneinfo *xs_tuneinfo_new(const gchar * pcFilename,
+xs_tuneinfo_t *xs_tuneinfo_new(const gchar * filename,
 		gint nsubTunes, gint startTune, const gchar * sidName,
 		const gchar * sidComposer, const gchar * sidCopyright,
 		gint loadAddr, gint initAddr, gint playAddr,
 		gint dataFileLen, const gchar *sidFormat, gint sidModel)
 {
-	t_xs_tuneinfo *pResult;
-	t_xs_sldb_node *tmpLength;
+	xs_tuneinfo_t *result;
+	sldb_node_t *tmpLength;
 	gint i;
 
 	/* Allocate structure */
-	pResult = (t_xs_tuneinfo *) g_malloc0(sizeof(t_xs_tuneinfo));
-	if (!pResult) {
-		xs_error(_("Could not allocate memory for t_xs_tuneinfo ('%s')\n"),
-			pcFilename);
+	result = (xs_tuneinfo_t *) g_malloc0(sizeof(xs_tuneinfo_t));
+	if (!result) {
+		xs_error("Could not allocate memory for tuneinfo ('%s')\n",
+			filename);
 		return NULL;
 	}
 
-	pResult->sidFilename = XS_CS_FILENAME(pcFilename);
-	if (!pResult->sidFilename) {
-		xs_error(_("Could not allocate sidFilename ('%s')\n"),
-			pcFilename);
-		g_free(pResult);
+	result->sidFilename = XS_CS_FILENAME(filename);
+	if (!result->sidFilename) {
+		xs_error("Could not allocate sidFilename ('%s')\n",
+			filename);
+		g_free(result);
 		return NULL;
 	}
 
 	/* Allocate space for subtune information */
-	pResult->subTunes = g_malloc0(sizeof(t_xs_subtuneinfo) * (nsubTunes + 1));
-	if (!pResult->subTunes) {
-		xs_error(_("Could not allocate memory for t_xs_subtuneinfo ('%s', %i)\n"),
-			pcFilename, nsubTunes);
+	result->subTunes = g_malloc0(sizeof(xs_subtuneinfo_t) * (nsubTunes + 1));
+	if (!result->subTunes) {
+		xs_error("Could not allocate memory for subtuneinfo ('%s', %i)\n",
+			filename, nsubTunes);
 
-		g_free(pResult->sidFilename);
-		g_free(pResult);
+		g_free(result->sidFilename);
+		g_free(result);
 		return NULL;
 	}
 
 	/* The following allocations don't matter if they fail */
-	pResult->sidName = XS_CS_SID(sidName);
-	pResult->sidComposer = XS_CS_SID(sidComposer);
-	pResult->sidCopyright = XS_CS_SID(sidCopyright);
+	result->sidName = XS_CS_SID(sidName);
+	result->sidComposer = XS_CS_SID(sidComposer);
+	result->sidCopyright = XS_CS_SID(sidCopyright);
 
-	pResult->nsubTunes = nsubTunes;
-	pResult->startTune = startTune;
+	result->nsubTunes = nsubTunes;
+	result->startTune = startTune;
 
-	pResult->loadAddr = loadAddr;
-	pResult->initAddr = initAddr;
-	pResult->playAddr = playAddr;
-	pResult->dataFileLen = dataFileLen;
-	pResult->sidFormat = XS_CS_SID(sidFormat);
+	result->loadAddr = loadAddr;
+	result->initAddr = initAddr;
+	result->playAddr = playAddr;
+	result->dataFileLen = dataFileLen;
+	result->sidFormat = XS_CS_SID(sidFormat);
 	
-	pResult->sidModel = sidModel;
+	result->sidModel = sidModel;
 
 	/* Get length information (NOTE: Do not free this!) */
-	tmpLength = xs_songlen_get(pcFilename);
+	tmpLength = xs_songlen_get(filename);
 	
 	/* Fill in sub-tune information */
-	for (i = 0; i < pResult->nsubTunes; i++) {
-		if (tmpLength && (i < tmpLength->nLengths))
-			pResult->subTunes[i].tuneLength = tmpLength->sLengths[i];
+	for (i = 0; i < result->nsubTunes; i++) {
+		if (tmpLength && (i < tmpLength->nlengths))
+			result->subTunes[i].tuneLength = tmpLength->lengths[i];
 		else
-			pResult->subTunes[i].tuneLength = -1;
+			result->subTunes[i].tuneLength = -1;
 		
-		pResult->subTunes[i].tuneSpeed = -1;
+		result->subTunes[i].tuneSpeed = -1;
 	}
 	
-	return pResult;
+	return result;
 }
 
 
 /* Free given tune information structure
  */
-void xs_tuneinfo_free(t_xs_tuneinfo * pTune)
+void xs_tuneinfo_free(xs_tuneinfo_t * tune)
 {
-	if (!pTune) return;
+	if (!tune) return;
 
-	g_free(pTune->subTunes);
-	g_free(pTune->sidFilename);
-	g_free(pTune->sidName);
-	g_free(pTune->sidComposer);
-	g_free(pTune->sidCopyright);
-	g_free(pTune->sidFormat);
-	g_free(pTune);
+	g_free(tune->subTunes);
+	g_free(tune->sidFilename);
+	g_free(tune->sidName);
+	g_free(tune->sidComposer);
+	g_free(tune->sidCopyright);
+	g_free(tune->sidFormat);
+	g_free(tune);
 }