--- a/src/xs_config.h	Sun Jun 22 00:17:04 2003 +0000
+++ b/src/xs_config.h	Sun Jun 22 11:01:03 2003 +0000
@@ -56,28 +56,29 @@
 	gfloat		filterFs;
 	gfloat		filterFm;
 	gfloat		filterFt;
-	gint		memoryMode;
+	gint		memoryMode;		/* See XS_MPU-constants */
 	gint		clockSpeed;		/* PAL (50Hz) or NTSC (60Hz) */
 	gboolean	forceSpeed;		/* TRUE = force to given clockspeed */
 
-	gboolean	oversampleEnable;	/* TRUE = oversample */
+	gboolean	oversampleEnable;
 	gint		oversampleFactor;	/* Factor of oversampling */
 
 
 	/* Playing settings */
-	gboolean	playMaxTimeEnable;	/* TRUE = use MAX playtime */
+	gboolean	playMaxTimeEnable;
 	gint		playMaxTime;		/* MAX playtime in seconds */
 	gboolean	songlenDBEnable;
-	gchar		*songlenDBPath;
+	gchar		*songlenDBPath;		/* Path to Songlengths.txt */
 
 
 	/* Miscellaneous settings */
 	gboolean	stilDBEnable;
-	gchar		*stilDBPath;
+	gchar		*stilDBPath;		/* Path to STIL.txt */
 
 	gboolean	detectMagic;
+	gboolean	alwaysRaise;
 
-	gboolean	titleOverride;
+	gboolean	titleOverride;		/* TRUE if XMMS titles are overriden */
 	gchar		*titleFormat;
 } xs_cfg;
 
@@ -86,20 +87,37 @@
  *	Configuration-file
  */
 enum {
-	ATYPE_INT = 1,
-	ATYPE_FLOAT,
-	ATYPE_STR,
-	ATYPE_BOOL
+	CTYPE_INT = 1,
+	CTYPE_FLOAT,
+	CTYPE_STR,
+	CTYPE_BOOL
+};
+
+enum {
+	WTYPE_BGROUP = 1,
+	WTYPE_SPIN,
+	WTYPE_SCALE,
+	WTYPE_BUTTON,
+	WTYPE_TEXT
 };
 
 
 typedef struct {
-	gint	atype;	/* Type of item (ATYPE_*) */
-	void	*adata;	/* Pointer to variable */
-	gchar	*aname;	/* Name of configuration item */
+	gint	valType;	/* Type of item (ATYPE_*) */
+	void	*valData;	/* Pointer to variable */
+	gchar	*valName;	/* Name of configuration item */
 } t_xs_cfg_item;
 
 
+typedef struct {
+	gint	widType;
+	gint	valType;
+	gchar	*widName;
+	void	*valData;
+	gint	valSet;
+} t_xs_wid_item;
+
+
 /*
  * Functions
  */