--- a/src/xs_config.c	Sun Dec 19 16:57:01 2004 +0000
+++ b/src/xs_config.c	Tue Dec 21 09:25:03 2004 +0000
@@ -145,21 +145,10 @@
 static const gint xs_widtable_max = (sizeof(xs_widtable) / sizeof(t_xs_wid_item));
 
 
-/*
- * Reset the filter settings
- */
-void xs_reset_filters(void)
-{
- /* Reset filter values (copied from libsidplay1's headers) */
- XS_MUTEX_LOCK(xs_cfg);
-
- xs_cfg.filterFs = 400.0f;
- xs_cfg.filterFm = 60.0f;
- xs_cfg.filterFt = 0.05f;
-
- XS_MUTEX_UNLOCK(xs_cfg);
-}
-
+/* libSIDPlay1 default filter values (copied from libsidplay1's headers) */
+#define	XS_SIDPLAY1_FS	(400.0f)
+#define XS_SIDPLAY1_FM	(60.0f)
+#define XS_SIDPLAY1_FT	(0.05f)
 
 /*
  * Get the configuration (from file or default)
@@ -179,8 +168,11 @@
  xs_cfg.audioFrequency		= 44100;
 
  xs_cfg.mos8580			= FALSE;
+
  xs_cfg.emulateFilters		= TRUE;
- xs_reset_filters();
+ xs_cfg.filterFs		= XS_SIDPLAY1_FS;
+ xs_cfg.filterFm		= XS_SIDPLAY1_FM;
+ xs_cfg.filterFt		= XS_SIDPLAY1_FT;
 
 #ifdef HAVE_SIDPLAY2
  xs_cfg.playerEngine		= XS_ENG_SIDPLAY2;
@@ -463,15 +455,17 @@
  */
 void xs_cfg_filter_reset(void)
 {
- XS_MUTEX_LOCK(xs_cfg);
-
- xs_reset_filters();
+ gtk_adjustment_set_value(
+ 	gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_emu_filt_fs"))),
+ 	XS_SIDPLAY1_FS);
 
- gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_emu_filt_fs"))), xs_cfg.filterFs);
- gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_emu_filt_fm"))), xs_cfg.filterFm);
- gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_emu_filt_ft"))), xs_cfg.filterFt);
+ gtk_adjustment_set_value(
+ 	gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_emu_filt_fm"))),
+ 	XS_SIDPLAY1_FM);
 
- XS_MUTEX_UNLOCK(xs_cfg);
+ gtk_adjustment_set_value(
+ 	gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_emu_filt_ft"))),
+ 	XS_SIDPLAY1_FT);
 }