# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1086491704 0
# Node ID 02bbce56d6b0672a68c3edbc7e5e345e1ef7903d
# Parent  450fea61cad58f212e1fc696f85b82c1f955e3ca
Renamed some struct variables.


diff -r 450fea61cad5 -r 02bbce56d6b0 src/xs_config.c
--- a/src/xs_config.c	Sat Jun 05 15:36:03 2004 +0000
+++ b/src/xs_config.c	Sun Jun 06 03:15:04 2004 +0000
@@ -255,24 +255,24 @@
  /* Read the new settings from XMMS configuration file */
  for (i = 0; i < xs_cfgtable_max; i++)
  	{
-	switch (xs_cfgtable[i].valType) {
+	switch (xs_cfgtable[i].itemType) {
 	case CTYPE_INT:
-		xmms_cfg_read_int(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, (gint *) xs_cfgtable[i].valData);
+		xmms_cfg_read_int(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, (gint *) xs_cfgtable[i].itemData);
 		break;
 
 	case CTYPE_BOOL:
-		xmms_cfg_read_boolean(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, (gboolean *) xs_cfgtable[i].valData);
+		xmms_cfg_read_boolean(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, (gboolean *) xs_cfgtable[i].itemData);
 		break;
 
 	case CTYPE_FLOAT:
-		xmms_cfg_read_float(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, (gfloat *) xs_cfgtable[i].valData);
+		xmms_cfg_read_float(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, (gfloat *) xs_cfgtable[i].itemData);
 		break;
 
 	case CTYPE_STR:
-		if (xmms_cfg_read_string(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, (gchar **) &tmpStr))
+		if (xmms_cfg_read_string(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, (gchar **) &tmpStr))
 			{
 			/* Read was successfull */
-			xs_strcalloc((gchar **) xs_cfgtable[i].valData, tmpStr);
+			xs_strcalloc((gchar **) xs_cfgtable[i].itemData, tmpStr);
 			g_free(tmpStr);
 			}
 		break;
@@ -320,21 +320,21 @@
  /* Write the new settings to XMMS configuration file */
  for (i = 0; i < xs_cfgtable_max; i++)
  	{
-	switch (xs_cfgtable[i].valType) {
+	switch (xs_cfgtable[i].itemType) {
 	case CTYPE_INT:
-		xmms_cfg_write_int(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, *(gint *) xs_cfgtable[i].valData);
+		xmms_cfg_write_int(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, *(gint *) xs_cfgtable[i].itemData);
 		break;
 
 	case CTYPE_BOOL:
-		xmms_cfg_write_boolean(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, *(gboolean *) xs_cfgtable[i].valData);
+		xmms_cfg_write_boolean(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, *(gboolean *) xs_cfgtable[i].itemData);
 		break;
 
 	case CTYPE_FLOAT:
-		xmms_cfg_write_float(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, *(gfloat *) xs_cfgtable[i].valData);
+		xmms_cfg_write_float(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, *(gfloat *) xs_cfgtable[i].itemData);
 		break;
 
 	case CTYPE_STR:
-		xmms_cfg_write_string(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].valName, *(gchar **) xs_cfgtable[i].valData);
+		xmms_cfg_write_string(cfgFile, XS_CONFIG_IDENT, xs_cfgtable[i].itemName, *(gchar **) xs_cfgtable[i].itemData);
 		break;
 
 	default:
@@ -386,7 +386,7 @@
 		if (GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName))->active)
 			{
 			/* Yes, set the constant value */
-			*((gint *) xs_widtable[i].valData) = xs_widtable[i].valSet;
+			*((gint *) xs_widtable[i].itemData) = xs_widtable[i].itemSet;
 			}
 		break;
 	
@@ -409,26 +409,26 @@
 		}
 		
 		/* Set the value */
-		switch (xs_widtable[i].valType) {
+		switch (xs_widtable[i].itemType) {
 		case CTYPE_INT:
-			*((gint *) xs_widtable[i].valData) = (gint) tmpValue;
+			*((gint *) xs_widtable[i].itemData) = (gint) tmpValue;
 			break;
 
 		case CTYPE_FLOAT:
-			*((gfloat *) xs_widtable[i].valData) = tmpValue;
+			*((gfloat *) xs_widtable[i].itemData) = tmpValue;
 			break;
 		}
 		break;
 	
 	case WTYPE_BUTTON:
 		/* Check if toggle-button is active */
-		*((gboolean *) xs_widtable[i].valData) =
+		*((gboolean *) xs_widtable[i].itemData) =
 			(GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName))->active);
 		break;
 
 	case WTYPE_TEXT:
 		/* Get text from text-widget */
-		xs_strcalloc((gchar **) xs_widtable[i].valData,
+		xs_strcalloc((gchar **) xs_widtable[i].itemData,
 			gtk_entry_get_text(GTK_ENTRY(LUW(xs_widtable[i].widName)))
 			);
 		break;
@@ -684,7 +684,7 @@
 		/* Check if current value matches the given one */
 		gtk_toggle_button_set_active(
 			GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName)),
-			(*((gint *) xs_widtable[i].valData) == xs_widtable[i].valSet)
+			(*((gint *) xs_widtable[i].itemData) == xs_widtable[i].itemSet)
 			);
 		break;
 	
@@ -692,13 +692,13 @@
 	case WTYPE_SPIN:
 	case WTYPE_SCALE:
 		/* Get the value */
-		switch (xs_widtable[i].valType) {
+		switch (xs_widtable[i].itemType) {
 		case CTYPE_INT:
-			tmpValue = (gfloat) *((gint *) xs_widtable[i].valData);
+			tmpValue = (gfloat) *((gint *) xs_widtable[i].itemData);
 			break;
 
 		case CTYPE_FLOAT:
-			tmpValue = *((gfloat *) xs_widtable[i].valData);
+			tmpValue = *((gfloat *) xs_widtable[i].itemData);
 			break;
 
 		default:
@@ -725,17 +725,17 @@
 		/* Set toggle-button */
 		gtk_toggle_button_set_active(
 			GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName)),
-			*((gboolean *) xs_widtable[i].valData)
+			*((gboolean *) xs_widtable[i].itemData)
 			);
 		break;
 
 	case WTYPE_TEXT:
 		/* Set text to text-widget */
-		if (*(gchar **) xs_widtable[i].valData != NULL)
+		if (*(gchar **) xs_widtable[i].itemData != NULL)
 			{
 			gtk_entry_set_text(
 				GTK_ENTRY(LUW(xs_widtable[i].widName)),
-				*(gchar **) xs_widtable[i].valData);
+				*(gchar **) xs_widtable[i].itemData);
 			}
 		break;
 	}
diff -r 450fea61cad5 -r 02bbce56d6b0 src/xs_config.h
--- a/src/xs_config.h	Sat Jun 05 15:36:03 2004 +0000
+++ b/src/xs_config.h	Sun Jun 06 03:15:04 2004 +0000
@@ -131,18 +131,18 @@
 
 
 typedef struct {
-	gint	valType;	/* Type of item (ATYPE_*) */
-	void	*valData;	/* Pointer to variable */
-	gchar	*valName;	/* Name of configuration item */
+	gint	itemType;	/* Type of item (CTYPE_*) */
+	void	*itemData;	/* Pointer to variable */
+	gchar	*itemName;	/* Name of configuration item */
 } t_xs_cfg_item;
 
 
 typedef struct {
 	gint	widType;
-	gint	valType;
+	gint	itemType;
 	gchar	*widName;
-	void	*valData;
-	gint	valSet;
+	void	*itemData;
+	gint	itemSet;
 } t_xs_wid_item;