--- a/src/xs_config.h	Fri Sep 19 23:55:01 2003 +0000
+++ b/src/xs_config.h	Fri Oct 03 03:11:05 2003 +0000
@@ -11,12 +11,17 @@
  * Configuration structure
  */
 enum XS_EMUENGINE {
-	XS_ENG_SIDPLAY1,
+	XS_ENG_SIDPLAY1 = 1,
 	XS_ENG_SIDPLAY2,
 	XS_ENG_NANOSID	
 };
 
 
+enum XS_BUILDER {
+	XS_BLD_RESID = 1,
+	XS_BLD_HARDSID
+};
+
 enum XS_RESOLUTION {
 	XS_RES_8BIT = 8,
 	XS_RES_16BIT = 16,
@@ -50,6 +55,13 @@
 };
 
 
+enum XS_SSC {
+	XS_SSC_NONE = 1,
+	XS_SSC_POPUP,
+	XS_SSC_PATCH
+};
+
+
 extern struct t_xs_cfg {
 	/* General audio settings */
 	gint		fmtBitsPerSample;
@@ -66,7 +78,8 @@
 	gint		clockSpeed;		/* PAL (50Hz) or NTSC (60Hz) */
 	gboolean	forceSpeed;		/* TRUE = force to given clockspeed */
 
-	gboolean	optimiseLevel;		/* SIDPlay2 emulation optimization */
+	gboolean	sid2OptLevel;		/* SIDPlay2 emulation optimization */
+	gint		sid2Builder;		/* SIDPlay2 "builder" aka SID-emu */
 
 	gboolean	oversampleEnable;
 	gint		oversampleFactor;	/* Factor of oversampling */
@@ -87,8 +100,8 @@
 	gboolean	stilDBEnable;
 	gchar		*stilDBPath;		/* Path to STIL.txt */
 
+	gint		subsongControl;
 	gboolean	detectMagic;
-	gboolean	alwaysRaise;
 
 	gboolean	titleOverride;		/* TRUE if XMMS titles are overriden */
 	gchar		*titleFormat;