--- a/src/xs_config.h	Thu Jun 19 20:49:01 2003 +0000
+++ b/src/xs_config.h	Thu Jun 19 22:38:01 2003 +0000
@@ -5,74 +5,86 @@
 extern "C" {
 #endif
 
-#include <config.h>
+#include <xmms-sid.h>
+
+/*
+ * Constants
+ */
+#define XS_CONFIG_IDENT		"XMMS-SID"	/* Configuration file identifier */
+#define XS_CONFIG_FILE		"/.xmms/config"
+
 
 /*
  * Configuration structure
  */
-enum XMMS_SID_CHN {
-	XMMS_SID_CHN_MONO = 0,
-	XMMS_SID_CHN_STEREO,
-	XMMS_SID_CHN_AUTOPAN
+enum XS_RES {
+	XS_RES_8BIT = 8,
+	XS_RES_16BIT = 16,
+	XS_RES_24BIT = 24
+};
+
+enum XS_CHN {
+	XS_CHN_MONO = 1,
+	XS_CHN_STEREO = 2,
+	XS_CHN_AUTOPAN = 3
 };
 
 
-enum XMMS_SID_CLOCK {
-	XMMS_SID_CLOCK_PAL = 1,
-	XMMS_SID_CLOCK_NTSC
+enum XS_CLOCK {
+	XS_CLOCK_PAL = 1,
+	XS_CLOCK_NTSC
 };
 
 
-enum XMMS_SID_MPU {
-	XMMS_SID_MPU_BANK_SWITCHING = 1,
-	XMMS_SID_MPU_TRANSPARENT_ROM,
-	XMMS_SID_MPU_PLAYSID_ENVIRONMENT
+enum XS_EMUENGINE {
+	XS_SIDPLAY1 = 1,
+	XS_SIDPLAY2
 };
 
 
-enum XMMS_SID_PMETHOD {
-	XMMS_SID_PMETHOD_NONE = 0,
-	XMMS_SID_PMETHOD_MAXSILENCE,
-	XMMS_SID_PMETHOD_DATABASE
+enum XS_MPU {
+	XS_MPU_BANK_SWITCHING = 1,
+	XS_MPU_TRANSPARENT_ROM,
+	XS_MPU_PLAYSID_ENVIRONMENT
 };
 
 
 extern struct t_xs_cfg {
-	gint fmtBitsPerSample;
-	gint fmtChannels;
-	gint fmtFrequency;
-
-	gboolean muffledOutput;
-	gboolean addStaticNoise;
-
-
-	gboolean mos8580;
-	gboolean emulateFilter;
-	gfloat filterFs;
-	gfloat filterFm;
-	gfloat filterFt;
-	gint memoryMode;
-	gint clockSpeed;
-	gboolean forceSpeed;
+	/* General audio settings */
+	gint		fmtBitsPerSample;
+	gint		fmtChannels;
+	gint		fmtFrequency;
 
 
-	gboolean playUseMaxTime;
-	gint playMaxTime;
-	gint playMethod;
-	gint playMaxSilentTime;
-	gint playSilentPercent;
-	gchar *playDBPath;
+	/* General libSIDPlay settings */
+	gboolean	mos8580;		/* TRUE = 8580, FALSE = 6581 */
+	gboolean	emulateFilters;
+	gfloat		filterFs;
+	gfloat		filterFm;
+	gfloat		filterFt;
+	gint		memoryMode;
+	gint		clockSpeed;		/* PAL (50Hz) or NTSC (60Hz) */
+	gboolean	forceSpeed;		/* TRUE = force to given clockspeed */
+
+	gboolean	oversampleEnable;	/* TRUE = oversample */
+	gint		oversampleFactor;	/* Factor of oversampling */
 
 
-	gboolean useSTIL;
-	gchar *STILpath;
-
-	gboolean finfoUseColors;
-	gboolean detectMagic;
+	/* Playing settings */
+	gboolean	playMaxTimeEnable;	/* TRUE = use MAX playtime */
+	gint		playMaxTime;		/* MAX playtime in seconds */
+	gboolean	songlenDBEnable;
+	gchar		*songlenDBPath;
 
 
-	gboolean titleOverride;
-	gchar *titleFormat;
+	/* Miscellaneous settings */
+	gboolean	stilDBEnable;
+	gchar		*stilDBPath;
+
+	gboolean	detectMagic;
+
+	gboolean	titleOverride;
+	gchar		*titleFormat;
 } xs_cfg;
 
 
@@ -98,7 +110,8 @@
  * Functions
  */
 void	xs_configure(void);
-void	xs_get_configure(void);
+void	xs_read_configuration(void);
+gint	xs_write_configuration(void);
 
 
 #ifdef __cplusplus