diff -Nurb --strip-trailing-cr xmp-3.4.0-orig/src/plugin/audacious3.c xmp-3.4.0/src/plugin/audacious3.c
--- xmp-3.4.0-orig/src/plugin/audacious3.c	2011-08-07 15:24:27.000000000 +0200
+++ xmp-3.4.0/src/plugin/audacious3.c	2012-01-02 13:34:54.904832532 +0100
@@ -16,12 +16,12 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include <audacious/configdb.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <audacious/plugin.h>
+#include <audacious/misc.h>
 #include <audacious/preferences.h>
 #include <libaudgui/libaudgui-gtk.h>
-#include <gtk/gtk.h>
-#include <glib.h>
 
 #include "xmp.h"
 #include "common.h"
@@ -66,6 +66,19 @@
 
 XMPConfig xmp_cfg;
 
+static const gchar* const plugin_defaults[] = {
+    "mixing_freq", "0",
+    "convert8bit", "0",
+    "fixloops", "0",
+    "modrange", "0",
+    "force8bit", "0",
+    "force_mono", "0",
+    "interpolation", "TRUE",
+    "filter", "TRUE",
+    "pan_amplitude", "80",
+    NULL
+};
+
 extern struct xmp_drv_info drv_smix;
 
 
@@ -158,8 +171,6 @@
 
 static gboolean init(void)
 {
-	mcs_handle_t *cfg;
-
 	_D("Plugin init");
 	xmp_drv_register(&drv_smix);
 	ctx = xmp_create_context();
@@ -168,19 +179,10 @@
 	seek_mutex = g_mutex_new();
 	seek_cond = g_cond_new();
 
-	xmp_cfg.mixing_freq = 0;
-	xmp_cfg.convert8bit = 0;
-	xmp_cfg.fixloops = 0;
-	xmp_cfg.modrange = 0;
-	xmp_cfg.force8bit = 0;
-	xmp_cfg.force_mono = 0;
-	xmp_cfg.interpolation = TRUE;
-	xmp_cfg.filter = TRUE;
-	xmp_cfg.pan_amplitude = 80;
+    aud_config_set_defaults("XMP",plugin_defaults);
 
-#define CFGREADINT(x) aud_cfg_db_get_int (cfg, "XMP", #x, &xmp_cfg.x)
+#define CFGREADINT(x) xmp_cfg.x = aud_get_int ("XMP", #x)
 
-	if ((cfg = aud_cfg_db_open())) {
 		CFGREADINT(mixing_freq);
 		CFGREADINT(force8bit);
 		CFGREADINT(convert8bit);
@@ -191,9 +193,6 @@
 		CFGREADINT(filter);
 		CFGREADINT(pan_amplitude);
 
-		aud_cfg_db_close(cfg);
-	}
-
 	configure_init();
 
 	xmp_init(ctx, 0, NULL);
@@ -412,7 +411,6 @@
 
 static void configure_apply()
 {
-	mcs_handle_t *cfg;
 	struct xmp_options *opt;
 
 	/* transfer Preferences UI config values back into XMPConfig */
@@ -435,9 +433,7 @@
 	opt = xmp_get_options(ctx);
 	opt->mix = xmp_cfg.pan_amplitude;
 
-	cfg = aud_cfg_db_open();
-
-#define CFGWRITEINT(x) aud_cfg_db_set_int (cfg, "XMP", #x, xmp_cfg.x)
+#define CFGWRITEINT(x) aud_set_int ("XMP", #x, xmp_cfg.x)
 
 	CFGWRITEINT(mixing_freq);
 	CFGWRITEINT(force8bit);
@@ -448,8 +444,6 @@
 	CFGWRITEINT(interpolation);
 	CFGWRITEINT(filter);
 	CFGWRITEINT(pan_amplitude);
-
-	aud_cfg_db_close(cfg);
 }
 
 static void configure_init(void)
@@ -532,22 +526,23 @@
 		NULL, NULL, FALSE, .cfg_type = VALUE_BOOLEAN},
 	{ WIDGET_LABEL, "Pan amplitude (%)", NULL, NULL, NULL, FALSE },
 	{ WIDGET_SPIN_BTN, "", &guicfg.panamp, NULL, NULL, FALSE,
-		{ .spin_btn = { 0.0, 100.0, 1.0, "" } },
-		.cfg_type = VALUE_FLOAT},
+      .cfg_type = VALUE_FLOAT, NULL, NULL,
+      { .spin_btn = { 0.0, 100.0, 1.0, "" } }
+    },
 };
 
 static PreferencesWidget prefs_opts_tab[] = {
-	{ WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE,
+	{ WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL,
 		{.box = { prefs_opts, G_N_ELEMENTS(prefs_opts), FALSE, FALSE}}},
 };
 
 static PreferencesWidget prefs_qual_row1[] = {
-	{ WIDGET_BOX, "Resolution", NULL, NULL, NULL, FALSE,
+	{ WIDGET_BOX, "Resolution", NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL,
 		{ .box = { prefs_precision, G_N_ELEMENTS(prefs_precision),
 			FALSE, TRUE }
 		}
 	},
-	{ WIDGET_BOX, "Channels", NULL, NULL, NULL, FALSE,
+	{ WIDGET_BOX, "Channels", NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL,
 		{ .box = { prefs_channels, G_N_ELEMENTS(prefs_channels),
 			FALSE, TRUE }
 		}
@@ -555,7 +550,7 @@
 };
 
 static PreferencesWidget prefs_qual_row2[] = {
-	{ WIDGET_BOX, "Sampling rate", NULL, NULL, NULL, FALSE,
+	{ WIDGET_BOX, "Sampling rate", NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL,
 		{ .box = { prefs_frequency, G_N_ELEMENTS(prefs_frequency),
 			FALSE, TRUE }
 		}
@@ -563,12 +558,12 @@
 };
 
 static PreferencesWidget prefs_qual_box1[] = {
-	{ WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE,
+	{ WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL,
 		{ .box = { prefs_qual_row1, G_N_ELEMENTS(prefs_qual_row1),
 			TRUE, TRUE }
 		}
 	},
-	{ WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE,
+	{ WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL,
 		{ .box = { prefs_qual_row2, G_N_ELEMENTS(prefs_qual_row2),
 			FALSE, TRUE }
 		}
@@ -576,7 +571,7 @@
 };
 
 static PreferencesWidget prefs_qual_tab[] = {
-	{ WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE,
+	{ WIDGET_BOX, NULL, NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL,
 		{ .box = { prefs_qual_box1, G_N_ELEMENTS(prefs_qual_box1),
 			FALSE, TRUE }
 		}
@@ -589,7 +584,7 @@
 };
 
 static PreferencesWidget prefs[] = {
-	{WIDGET_NOTEBOOK, NULL, NULL, NULL, NULL, FALSE,
+	{WIDGET_NOTEBOOK, NULL, NULL, NULL, NULL, FALSE, VALUE_NULL, NULL, NULL,
 		{ .notebook = { prefs_tabs, G_N_ELEMENTS(prefs_tabs) } },
 	},
 };
diff -Nurb --strip-trailing-cr xmp-3.4.0-orig/src/plugin/Makefile xmp-3.4.0/src/plugin/Makefile
--- xmp-3.4.0-orig/src/plugin/Makefile	2011-08-06 15:51:13.000000000 +0200
+++ xmp-3.4.0/src/plugin/Makefile	2012-01-02 13:34:33.429987960 +0100
@@ -47,7 +47,7 @@
 	eval $$CMD
 
 $(PLUGIN_PATH)/audacious3.lo: $(PLUGIN_PATH)/audacious3.c $(PLUGIN_PATH)/Makefile
-	@CMD='$(CC) $(CFLAGS) -fPIC -D_REENTRANT $(XCFLAGS) `pkg-config --cflags audacious` -o $@ $(PLUGIN_PATH)/audacious3.c'; \
+	@CMD='$(CC) $(CFLAGS) -fPIC -D_REENTRANT $(XCFLAGS) `pkg-config --cflags audacious glib-2.0 gtk+-3.0` -o $@ $(PLUGIN_PATH)/audacious3.c'; \
 	if [ "$(V)" -gt 0 ]; then echo $$CMD; else echo CC $@ ; fi; \
 	eval $$CMD