Mercurial > audlegacy-plugins

changeset 2523:769e17da93dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced s/ConfigDb/mcs_handle_t/g, as per changes in the core.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 09 Apr 2008 15:48:36 +0300
parents 7b5b4a51ea6e
children c42fa8f89616
files src/CoreAudio/configure.c src/CoreAudio/init.c src/OSS/configure.c src/OSS/init.c src/OSS4/OSS4.c src/OSS4/configure.c src/OSS4/init.c src/adplug/adplug-xmms.cc src/alarm/alarm.c src/alsa/configure.c src/alsa/init.c src/aosd/aosd_cfg.c src/arts/audio.c src/arts/configure.c src/audiocompress/audacious-glue.c src/blur_scope/blur_scope.c src/blur_scope/config.c src/cdaudio-ng/cdaudio-ng.c src/console/Audacious_Config.cxx src/crystalizer/crystalizer.c src/echo_plugin/echo.c src/echo_plugin/gui.c src/esd/configure.c src/esd/init.c src/esd/mixer.c src/filewriter/filewriter.c src/filewriter/mp3.c src/filewriter/vorbis.c src/hotkey/plugin.c src/jack/configure.c src/jack/jack.c src/ladspa/ladspa.c src/lastfm/lastfm.c src/lirc/lirc_cfg.c src/madplug/configure.c src/madplug/plugin.c src/modplug/modplugbmp.cxx src/musepack/libmpc.cxx src/neon/neon.c src/null/null.c src/paranormal-ng/cfg.c src/paranormal/cfg.c src/rootvis/config_backend.c src/scrobbler/configure.c src/scrobbler/plugin.c src/shnplug/gtk.c src/shnplug/shn.c src/sid/xs_config.c src/sndstretch/sndstretch_xmms.c src/song_change/song_change.c src/statusicon/si_cfg.c src/stereo_plugin/stereo.c src/sun/configure.c src/sun/sun.c src/timidity/xmms-timidity.c src/vorbis/configure.c src/vorbis/vorbis.c src/vtx/vtx.c src/wavpack/libwavpack.cxx src/wavpack/ui.cxx
diffstat 60 files changed, 89 insertions(+), 89 deletions(-) [+]
line wrap: on
line diff
--- a/src/CoreAudio/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/CoreAudio/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -30,7 +30,7 @@
 
 static void configure_win_ok_cb(GtkWidget * w, gpointer data)
 {
-	ConfigDb *cfgfile;
+	mcs_handle_t *cfgfile;
 
 	osx_cfg.audio_device = audio_device;
 	osx_cfg.mixer_device = mixer_device;
--- a/src/CoreAudio/init.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/CoreAudio/init.c	Wed Apr 09 15:48:36 2008 +0300
@@ -24,7 +24,7 @@
 
 void osx_init(void)
 {
-	ConfigDb *cfgfile;
+	mcs_handle_t *cfgfile;
 
 	left_volume = 1.0;
 	right_volume = 1.0;
--- a/src/OSS/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/OSS/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -38,7 +38,7 @@
 static void
 configure_win_ok_cb(GtkWidget * w, gpointer data)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
 
     oss_cfg.audio_device = audio_device;
     oss_cfg.mixer_device = mixer_device;
--- a/src/OSS/init.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/OSS/init.c	Wed Apr 09 15:48:36 2008 +0300
@@ -29,7 +29,7 @@
 void
 oss_init(void)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
 
     memset(&oss_cfg, 0, sizeof(OSSConfig));
 
--- a/src/OSS4/OSS4.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/OSS4/OSS4.c	Wed Apr 09 15:48:36 2008 +0300
@@ -52,7 +52,7 @@
 
 void oss_cleanup(void)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
     db = aud_cfg_db_open();
     aud_cfg_db_set_int(db, "OSS", "saved_volume", vol);
     aud_cfg_db_close(db);
--- a/src/OSS4/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/OSS4/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -37,7 +37,7 @@
 static void
 configure_win_ok_cb(GtkWidget * w, gpointer data)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
 
     oss_cfg.audio_device = audio_device;
     oss_cfg.buffer_size =
--- a/src/OSS4/init.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/OSS4/init.c	Wed Apr 09 15:48:36 2008 +0300
@@ -30,7 +30,7 @@
 void
 oss_init(void)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
 
     memset(&oss_cfg, 0, sizeof(OSSConfig));
 
--- a/src/adplug/adplug-xmms.cc	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/adplug/adplug-xmms.cc	Wed Apr 09 15:48:36 2008 +0300
@@ -1037,7 +1037,7 @@
 adplug_init (void)
 {
   dbg_printf ("adplug_init(): open, ");
-  ConfigDb *db = aud_cfg_db_open ();
+  mcs_handle_t *db = aud_cfg_db_open ();
 
   // Read configuration
   dbg_printf ("read, ");
@@ -1089,7 +1089,7 @@
 adplug_quit (void)
 {
   dbg_printf ("adplug_quit(): open, ");
-  ConfigDb *db = aud_cfg_db_open ();
+  mcs_handle_t *db = aud_cfg_db_open ();
 
   // Close database
   dbg_printf ("db, ");
--- a/src/alarm/alarm.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/alarm/alarm.c	Wed Apr 09 15:48:36 2008 +0300
@@ -172,7 +172,7 @@
 void alarm_save(GtkButton *w, gpointer data)
 {
    int daynum = 0;  // used to identify day number
-   ConfigDb *conf;
+   mcs_handle_t *conf;
 
    DEBUG("alarm_save\n");
 
@@ -291,7 +291,7 @@
 static void alarm_read_config()
 {
    int daynum = 0;   // used for day number
-   ConfigDb *conf;
+   mcs_handle_t *conf;
 
    DEBUG("alarm_read_config\n");
 
--- a/src/alsa/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/alsa/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -46,7 +46,7 @@
 
 void alsa_save_config(void)
 {
-	ConfigDb *cfgfile = aud_cfg_db_open();
+	mcs_handle_t *cfgfile = aud_cfg_db_open();
 
 	aud_cfg_db_set_int(cfgfile, "ALSA", "buffer_time", alsa_cfg.buffer_time);
 	aud_cfg_db_set_int(cfgfile, "ALSA", "period_time", alsa_cfg.period_time);
--- a/src/alsa/init.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/alsa/init.c	Wed Apr 09 15:48:36 2008 +0300
@@ -25,7 +25,7 @@
 
 void alsa_init(void)
 {
-	ConfigDb *cfgfile;
+	mcs_handle_t *cfgfile;
 
 	memset(&alsa_cfg, 0, sizeof (alsa_cfg));
 	alsa_cfg.buffer_time = 500;
--- a/src/aosd/aosd_cfg.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/aosd/aosd_cfg.c	Wed Apr 09 15:48:36 2008 +0300
@@ -221,7 +221,7 @@
 gint
 aosd_cfg_load ( aosd_cfg_t * cfg )
 {
-  ConfigDb *cfgfile = aud_cfg_db_open();
+  mcs_handle_t *cfgfile = aud_cfg_db_open();
   gint i = 0;
   gint max_numcol;
   gchar *trig_active_str;
@@ -369,7 +369,7 @@
 gint
 aosd_cfg_save ( aosd_cfg_t * cfg )
 {
-  ConfigDb *cfgfile = aud_cfg_db_open();
+  mcs_handle_t *cfgfile = aud_cfg_db_open();
   gint i = 0;
   gint max_numcol;
   GString *string = g_string_new( "" );
--- a/src/arts/audio.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/arts/audio.c	Wed Apr 09 15:48:36 2008 +0300
@@ -56,7 +56,7 @@
 
 void artsxmms_init(void)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	memset(&artsxmms_cfg, 0, sizeof (artsxmms_cfg));
 
--- a/src/arts/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/arts/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -18,7 +18,7 @@
 
 static void configure_win_ok_cb(GtkWidget * w, gpointer data)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	artsxmms_cfg.buffer_size =
 		gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_size_spin));
--- a/src/audiocompress/audacious-glue.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/audiocompress/audacious-glue.c	Wed Apr 09 15:48:36 2008 +0300
@@ -119,7 +119,7 @@
 
 void initPrefs(CompressorPrefs * prefs)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	db = aud_cfg_db_open();
 
@@ -158,7 +158,7 @@
 
 void savePrefs(CompressorPrefs * prefs)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	db = aud_cfg_db_open();
 
--- a/src/blur_scope/blur_scope.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/blur_scope/blur_scope.c	Wed Apr 09 15:48:36 2008 +0300
@@ -94,7 +94,7 @@
 void
 bscope_read_config(void)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
 
     if (!config_read) {
         bscope_cfg.color = 0xFF3F7F;
--- a/src/blur_scope/config.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/blur_scope/config.c	Wed Apr 09 15:48:36 2008 +0300
@@ -16,7 +16,7 @@
 static void
 configure_ok(GtkWidget * w, gpointer data)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
     gdouble color[3];
 
     gtk_color_selection_get_color(GTK_COLOR_SELECTION(options_colorpicker),
--- a/src/cdaudio-ng/cdaudio-ng.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/cdaudio-ng/cdaudio-ng.c	Wed Apr 09 15:48:36 2008 +0300
@@ -144,7 +144,7 @@
 
 static void cdaudio_init()
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 	gchar *menu_item_text;
 
 	debug("cdaudio_init()\n");
@@ -583,7 +583,7 @@
 
 	// todo: destroy the gui
 
-	ConfigDb *db = aud_cfg_db_open();
+	mcs_handle_t *db = aud_cfg_db_open();
 	aud_cfg_db_set_bool(db, "CDDA", "use_dae", cdng_cfg.use_dae);
 	aud_cfg_db_set_int(db, "CDDA", "limitspeed", cdng_cfg.limitspeed);
 	aud_cfg_db_set_bool(db, "CDDA", "use_cdtext", cdng_cfg.use_cdtext);
--- a/src/console/Audacious_Config.cxx	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/console/Audacious_Config.cxx	Wed Apr 09 15:48:36 2008 +0300
@@ -20,7 +20,7 @@
 
 void console_cfg_load( void )
 {
-    ConfigDb *db = aud_cfg_db_open();
+    mcs_handle_t *db = aud_cfg_db_open();
     aud_cfg_db_get_int(db, "console", "loop_length", &audcfg.loop_length);
     aud_cfg_db_get_bool(db, "console", "resample", &audcfg.resample);
     aud_cfg_db_get_int(db, "console", "resample_rate", &audcfg.resample_rate);
@@ -35,7 +35,7 @@
 
 void console_cfg_save( void )
 {
-    ConfigDb *db = aud_cfg_db_open();
+    mcs_handle_t *db = aud_cfg_db_open();
     aud_cfg_db_set_int(db, "console", "loop_length", audcfg.loop_length);
     aud_cfg_db_set_bool(db, "console", "resample", audcfg.resample);
     aud_cfg_db_set_int(db, "console", "resample_rate", audcfg.resample_rate);
--- a/src/crystalizer/crystalizer.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/crystalizer/crystalizer.c	Wed Apr 09 15:48:36 2008 +0300
@@ -45,7 +45,7 @@
 
 static void init(void)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 	db = aud_cfg_db_open();
 	if (!aud_cfg_db_get_double(db, "crystalizer", "intensity", &value))
 		value = 1.0;
@@ -55,7 +55,7 @@
 /* conf dialog stuff stolen from stereo plugin --nenolod */ 
 static void conf_ok_cb(GtkButton * button, gpointer data)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	value = *(gdouble *) data;
 	
--- a/src/echo_plugin/echo.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/echo_plugin/echo.c	Wed Apr 09 15:48:36 2008 +0300
@@ -40,7 +40,7 @@
 
 static void init(void)
 {
-	ConfigDb *cfg;
+	mcs_handle_t *cfg;
 	
 	if (sizeof(short) != sizeof(gint16))
 		abort();
--- a/src/echo_plugin/gui.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/echo_plugin/gui.c	Wed Apr 09 15:48:36 2008 +0300
@@ -31,7 +31,7 @@
 
 static void apply_changes(void)
 {
-	ConfigDb *cfg;
+	mcs_handle_t *cfg;
 	echo_delay = GTK_ADJUSTMENT(echo_delay_adj)->value;
 	echo_feedback = GTK_ADJUSTMENT(echo_feedback_adj)->value;
 	echo_volume = GTK_ADJUSTMENT(echo_volume_adj)->value;
--- a/src/esd/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/esd/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -37,7 +37,7 @@
 static void
 configure_win_ok_cb(GtkWidget * w, gpointer data)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
 
     esd_cfg.use_remote =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(server_use_remote));
--- a/src/esd/init.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/esd/init.c	Wed Apr 09 15:48:36 2008 +0300
@@ -30,7 +30,7 @@
 void
 esdout_init(void)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
     char *env;
     int lp = 80 , rp = 80;
 
--- a/src/esd/mixer.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/esd/mixer.c	Wed Apr 09 15:48:36 2008 +0300
@@ -142,7 +142,7 @@
 void
 esdout_set_volume(int l, int r)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
     lp = l;
     rp = r;
 
--- a/src/filewriter/filewriter.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/filewriter/filewriter.c	Wed Apr 09 15:48:36 2008 +0300
@@ -134,7 +134,7 @@
 
 static void file_init(void)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
     /*GtkWidget *menu_root;
 
     menu_root = gtk_menu_item_new_with_label(_("FileWriter"));
@@ -375,7 +375,7 @@
 
 static void configure_ok_cb(gpointer data)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
 
     fileext = gtk_combo_box_get_active(GTK_COMBO_BOX(fileext_combo));
 
--- a/src/filewriter/mp3.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/filewriter/mp3.c	Wed Apr 09 15:48:36 2008 +0300
@@ -160,7 +160,7 @@
 
 static void mp3_init(void)
 {
-    ConfigDb *db = aud_cfg_db_open();
+    mcs_handle_t *db = aud_cfg_db_open();
     aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_on", &vbr_on);
     aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_type", &vbr_type);
     aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_min_val", &vbr_min_val);
@@ -615,7 +615,7 @@
 
 static void configure_ok_cb(gpointer data)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
 
     if (vbr_min_val > vbr_max_val)
         vbr_max_val = vbr_min_val;
--- a/src/filewriter/vorbis.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/filewriter/vorbis.c	Wed Apr 09 15:48:36 2008 +0300
@@ -63,7 +63,7 @@
 
 static void vorbis_init(void)
 {
-    ConfigDb *db = aud_cfg_db_open();
+    mcs_handle_t *db = aud_cfg_db_open();
 
     aud_cfg_db_get_float(db, "filewriter_vorbis", "base_quality", &v_base_quality);
 
@@ -245,7 +245,7 @@
 
 static void configure_ok_cb(gpointer data)
 {
-    ConfigDb *db = aud_cfg_db_open();
+    mcs_handle_t *db = aud_cfg_db_open();
 
     aud_cfg_db_set_float(db, "filewrite_vorbis", "base_quality", v_base_quality);
 
--- a/src/hotkey/plugin.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/hotkey/plugin.c	Wed Apr 09 15:48:36 2008 +0300
@@ -318,7 +318,7 @@
 /* load plugin configuration */
 void load_config (void)
 {
-	ConfigDb *cfdb;
+	mcs_handle_t *cfdb;
 	HotkeyConfiguration *hotkey;
 	int i,max;
 	
@@ -377,7 +377,7 @@
 /* save plugin configuration */
 void save_config (void)
 {
-	ConfigDb *cfdb;
+	mcs_handle_t *cfdb;
 	int max;
 	HotkeyConfiguration *hotkey;
 
--- a/src/jack/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/jack/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -45,7 +45,7 @@
 
 static void configure_win_ok_cb(GtkWidget * w, gpointer data)
 {
-        ConfigDb *cfgfile;
+        mcs_handle_t *cfgfile;
 
         jack_cfg.isTraceEnabled = (gint) GTK_CHECK_BUTTON(GTK_isTraceEnabled)->toggle_button.active;
   jack_cfg.port_connection_mode = GET_CHARS(GTK_COMBO(port_connection_mode_combo)->entry);
--- a/src/jack/jack.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/jack/jack.c	Wed Apr 09 15:48:36 2008 +0300
@@ -182,7 +182,7 @@
 void jack_init(void)
 {
   /* read the isTraceEnabled setting from the config file */
-  ConfigDb *cfgfile;
+  mcs_handle_t *cfgfile;
 
   cfgfile = aud_cfg_db_open();
   if (!cfgfile)
@@ -251,7 +251,7 @@
 /* Close the device */
 void jack_close(void)
 {
-  ConfigDb *cfgfile;
+  mcs_handle_t *cfgfile;
 
   cfgfile = aud_cfg_db_open();
   aud_cfg_db_set_int(cfgfile, "jack", "volume_left", jack_cfg.volume_left); /* stores the volume setting */
--- a/src/ladspa/ladspa.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/ladspa/ladspa.c	Wed Apr 09 15:48:36 2008 +0300
@@ -140,7 +140,7 @@
 
 static void restore (void)
 {
-  ConfigDb *db;
+  mcs_handle_t *db;
   gint k, plugins= 0;
 
   db = aud_cfg_db_open();
@@ -253,7 +253,7 @@
 static void stop (void)
 {
   GSList *list;
-  ConfigDb *db;
+  mcs_handle_t *db;
   gint plugins = 0;
 
   if (state.running == FALSE) {
--- a/src/lastfm/lastfm.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/lastfm/lastfm.c	Wed Apr 09 15:48:36 2008 +0300
@@ -106,7 +106,7 @@
 
 gchar* lastfm_get_login_uri()  /* reads the audioscrobbler login data from the config */
 {                              /* and then uses them to create a login URL*/
-        ConfigDb *cfg = NULL;
+        mcs_handle_t *cfg = NULL;
         gchar   *buf=NULL,
                 *username = NULL, 
                 *password = NULL;
--- a/src/lirc/lirc_cfg.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/lirc/lirc_cfg.c	Wed Apr 09 15:48:36 2008 +0300
@@ -14,7 +14,7 @@
 
 void load_cfg(void)
 {
-  ConfigDb *db;
+  mcs_handle_t *db;
   db = aud_cfg_db_open();
   aud_cfg_db_get_int(db, "lirc", "enable_reconnect", &b_enable_reconnect);
   aud_cfg_db_get_int(db, "lirc", "reconnect_timeout", &reconnect_timeout);
@@ -26,7 +26,7 @@
 
 void save_cfg(void)
 {
-  ConfigDb *db;
+  mcs_handle_t *db;
   db = aud_cfg_db_open();
   aud_cfg_db_set_int(db, "lirc", "enable_reconnect", b_enable_reconnect);
   aud_cfg_db_set_int(db, "lirc", "reconnect_timeout", reconnect_timeout);
--- a/src/madplug/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/madplug/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -90,7 +90,7 @@
 static void
 save_config(void)
 {
-    ConfigDb *db = aud_cfg_db_open();
+    mcs_handle_t *db = aud_cfg_db_open();
 
     AUDDBG("saving\n");
 
--- a/src/madplug/plugin.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/madplug/plugin.c	Wed Apr 09 15:48:36 2008 +0300
@@ -91,7 +91,7 @@
 static void
 audmad_init()
 {
-    ConfigDb *db = NULL;
+    mcs_handle_t *db = NULL;
 
     audmad_config = g_malloc0(sizeof(audmad_config_t));
 
--- a/src/modplug/modplugbmp.cxx	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/modplug/modplugbmp.cxx	Wed Apr 09 15:48:36 2008 +0300
@@ -74,7 +74,7 @@
 
 void ModplugXMMS::Init(void)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 	
 	db = aud_cfg_db_open();
 
@@ -589,7 +589,7 @@
 
 void ModplugXMMS::SetModProps(const Settings& aModProps)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 	mModProps = aModProps;
 
 	// [Reverb level 0(quiet)-100(loud)], [delay in ms, usually 40-200ms]
--- a/src/musepack/libmpc.cxx	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/musepack/libmpc.cxx	Wed Apr 09 15:48:36 2008 +0300
@@ -127,7 +127,7 @@
 
 static void mpcOpenPlugin()
 {
-    ConfigDb *cfg;
+    mcs_handle_t *cfg;
     cfg = aud_cfg_db_open();
     aud_cfg_db_get_bool(cfg, "musepack", "clipPrevention", &pluginConfig.clipPrevention);
     aud_cfg_db_get_bool(cfg, "musepack", "albumGain",      &pluginConfig.albumGain);
@@ -251,7 +251,7 @@
 
 static void saveConfigBox(GtkWidget* p_Widget, gpointer p_Data)
 {
-    ConfigDb* cfg;
+    mcs_handle_t* cfg;
     GtkToggleButton* tb;
 
     tb = GTK_TOGGLE_BUTTON(widgets.replaygainCheck);
--- a/src/neon/neon.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/neon/neon.c	Wed Apr 09 15:48:36 2008 +0300
@@ -481,7 +481,7 @@
 
 static int neon_proxy_auth_cb(void *userdata, const char *realm, int attempt, char *username, char *password) {
 
-    ConfigDb *db;
+    mcs_handle_t *db;
     gchar *value = NULL;
 
     _ENTER;
@@ -612,7 +612,7 @@
 static int open_handle(struct neon_handle* handle, unsigned long startbyte) {
 
     int ret;
-    ConfigDb* db;
+    mcs_handle_t* db;
     gchar* proxy_host = NULL;
     gchar* proxy_port_s = NULL;
     gchar* endptr;
--- a/src/null/null.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/null/null.c	Wed Apr 09 15:48:36 2008 +0300
@@ -42,7 +42,7 @@
 
 static void null_init(void)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 	db = aud_cfg_db_open();
 	aud_cfg_db_get_bool(db, "null", "real_time", &real_time);
 	aud_cfg_db_close(db);
@@ -71,7 +71,7 @@
 
 static void null_configure_ok_cb(GtkButton *w, gpointer data)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	db = aud_cfg_db_open();
 	real_time = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data));
--- a/src/paranormal-ng/cfg.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/paranormal-ng/cfg.c	Wed Apr 09 15:48:36 2008 +0300
@@ -368,7 +368,7 @@
       static const char *fname;
       struct pn_actuator *a;
       GtkCTreeNode *root;
-      ConfigDb *db;
+      mcs_handle_t *db;
 
       db = aud_cfg_db_open();
       fname = (char *) gtk_file_selection_get_filename (selector);
@@ -392,7 +392,7 @@
 load_button_cb (GtkButton *button, gpointer data)
 {
   GtkWidget *selector;
-  ConfigDb *db;
+  mcs_handle_t *db;
   gchar *last_path;
 
   db = aud_cfg_db_open();
--- a/src/paranormal/cfg.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/paranormal/cfg.c	Wed Apr 09 15:48:36 2008 +0300
@@ -368,7 +368,7 @@
       static const char *fname;
       struct pn_actuator *a;
       GtkCTreeNode *root;
-      ConfigDb *db;
+      mcs_handle_t *db;
 
       db = aud_cfg_db_open();
       fname = (char *) gtk_file_selection_get_filename (selector);
@@ -392,7 +392,7 @@
 load_button_cb (GtkButton *button, gpointer data)
 {
   GtkWidget *selector;
-  ConfigDb *db;
+  mcs_handle_t *db;
   gchar *last_path;
 
   db = aud_cfg_db_open();
--- a/src/rootvis/config_backend.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/rootvis/config_backend.c	Wed Apr 09 15:48:36 2008 +0300
@@ -36,7 +36,7 @@
 	}
 }
 
-void cval_writefile(struct config_value val, ConfigDb *fp, char* sect)
+void cval_writefile(struct config_value val, mcs_handle_t *fp, char* sect)
 {
 	switch (val.type)
 	{
@@ -59,7 +59,7 @@
 	}
 }
 
-void cval_readfile(struct config_value val, ConfigDb *fp, char* sect)
+void cval_readfile(struct config_value val, mcs_handle_t *fp, char* sect)
 {
 	switch (val.type)
 	{
@@ -92,7 +92,7 @@
 // after the configuration dialogue is finished, this won't be necessary any more
 void config_read(int number) {
 	int i, j;
-	ConfigDb *fp;
+	mcs_handle_t *fp;
 
 	fp = aud_cfg_db_open();
 
@@ -119,7 +119,7 @@
 
 void config_write(int number) {
 	int i, j;
-	ConfigDb *fp;
+	mcs_handle_t *fp;
 
 	print_status("Writing configuration");
 	fp = aud_cfg_db_open();
--- a/src/scrobbler/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/scrobbler/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -45,7 +45,7 @@
 
 static void saveconfig(void)
 {
-    ConfigDb *cfgfile;
+    mcs_handle_t *cfgfile;
 
     const char *uid = gtk_entry_get_text(GTK_ENTRY(entry1));
     const char *pwd = gtk_entry_get_text(GTK_ENTRY(entry2));
@@ -122,7 +122,7 @@
 GtkWidget *
 create_cfgdlg(void)
 {
-  ConfigDb *db;
+  mcs_handle_t *db;
   GtkWidget *vbox2;
   GtkWidget *table1;
   GtkWidget *label3;
--- a/src/scrobbler/plugin.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/scrobbler/plugin.c	Wed Apr 09 15:48:36 2008 +0300
@@ -100,7 +100,7 @@
 void start(void) {
 	char *username = NULL, *password = NULL;
 	char *ge_username = NULL, *ge_password = NULL;
-	ConfigDb *cfgfile;
+	mcs_handle_t *cfgfile;
 	sc_going = 1;
 	ge_going = 1;
 	GError **moo = NULL;
--- a/src/shnplug/gtk.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/shnplug/gtk.c	Wed Apr 09 15:48:36 2008 +0300
@@ -99,7 +99,7 @@
 
 void shn_configurewin_save(void)
 {
-	ConfigDb *cfg;
+	mcs_handle_t *cfg;
 	gchar *filename;
 
 	shn_cfg.error_output_method = ERROR_OUTPUT_DEVNULL;
--- a/src/shnplug/shn.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/shnplug/shn.c	Wed Apr 09 15:48:36 2008 +0300
@@ -89,7 +89,7 @@
 
 static void shn_init()
 {
-	ConfigDb *cfg;
+	mcs_handle_t *cfg;
 
 	shn_cfg.error_output_method = ERROR_OUTPUT_DEVNULL;
 	shn_cfg.error_output_method_config_name = "error_output_method";
--- a/src/sid/xs_config.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/sid/xs_config.c	Wed Apr 09 15:48:36 2008 +0300
@@ -24,7 +24,7 @@
 
 #ifdef AUDACIOUS_PLUGIN
 #include <audacious/plugin.h>
-#define XS_CONFIG_FILE        ConfigDb
+#define XS_CONFIG_FILE        mcs_handle_t
 #define XS_CONFIG_OPEN        aud_cfg_db_open
 #define XS_CONFIG_FREE        aud_cfg_db_close
 
--- a/src/sndstretch/sndstretch_xmms.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/sndstretch/sndstretch_xmms.c	Wed Apr 09 15:48:36 2008 +0300
@@ -256,7 +256,7 @@
 
 static gint sndstretch_config_destroy_cb(GtkWidget * w, GdkEventAny * e, gpointer data)
 {
-	ConfigDb *db = aud_cfg_db_open();
+	mcs_handle_t *db = aud_cfg_db_open();
 
 	aud_cfg_db_set_double(db, "sndstretch", "pitch", SS.pitch);
 	aud_cfg_db_set_double(db, "sndstretch", "speed", SS.speed);
@@ -402,7 +402,7 @@
 
 void sndstretch_init(void)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	db = aud_cfg_db_open();
 
--- a/src/song_change/song_change.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/song_change/song_change.c	Wed Apr 09 15:48:36 2008 +0300
@@ -161,7 +161,7 @@
 
 static void read_config(void)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	db = aud_cfg_db_open();
 	if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line", &cmd_line) )
@@ -205,7 +205,7 @@
 
 static void save_and_close(GtkWidget *w, gpointer data)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 	char *cmd, *cmd_after, *cmd_end, *cmd_ttc;
 
 	cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(cmd_entry)));
--- a/src/statusicon/si_cfg.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/statusicon/si_cfg.c	Wed Apr 09 15:48:36 2008 +0300
@@ -28,7 +28,7 @@
 void
 si_cfg_load ( void )
 {
-  ConfigDb *cfgfile = aud_cfg_db_open();
+  mcs_handle_t *cfgfile = aud_cfg_db_open();
 
   if ( !aud_cfg_db_get_int( cfgfile , "statusicon" ,
        "rclick_menu" , &(si_cfg.rclick_menu) ) )
@@ -59,7 +59,7 @@
 void
 si_cfg_save ( void )
 {
-  ConfigDb *cfgfile = aud_cfg_db_open();
+  mcs_handle_t *cfgfile = aud_cfg_db_open();
 
   aud_cfg_db_set_int( cfgfile , "statusicon" ,
     "rclick_menu" , si_cfg.rclick_menu );
--- a/src/stereo_plugin/stereo.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/stereo_plugin/stereo.c	Wed Apr 09 15:48:36 2008 +0300
@@ -33,7 +33,7 @@
 
 static void init(void)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 	db = aud_cfg_db_open();
 	if (!aud_cfg_db_get_double(db, "extra_stereo", "intensity", &value))
 		value = 2.5;
@@ -57,7 +57,7 @@
 
 static void conf_ok_cb(GtkButton * button, gpointer data)
 {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	value = *(gdouble *) data;
 	
--- a/src/sun/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/sun/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -39,7 +39,7 @@
 
 static void configure_win_ok_cb(GtkWidget *w, gpointer data)
 {
-	ConfigDb *cfgfile;
+	mcs_handle_t *cfgfile;
 
 	strcpy(audio.devaudio, gtk_entry_get_text(GTK_ENTRY(adevice_entry)));
 	strcpy(audio.devmixer, gtk_entry_get_text(GTK_ENTRY(mdevice_entry)));
--- a/src/sun/sun.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/sun/sun.c	Wed Apr 09 15:48:36 2008 +0300
@@ -52,7 +52,7 @@
 
 void sun_init(void)
 {
-	ConfigDb *cfgfile;
+	mcs_handle_t *cfgfile;
 	char *s;
 
 	memset(&audio, 0, sizeof(struct sun_audio));
--- a/src/timidity/xmms-timidity.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/timidity/xmms-timidity.c	Wed Apr 09 15:48:36 2008 +0300
@@ -83,7 +83,7 @@
 	*xmmstimid_conf_channels_2;
 
 void xmmstimid_init(void) {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	xmmstimid_cfg.config_file = NULL;
 	xmmstimid_cfg.rate = 44100;
@@ -187,7 +187,7 @@
 }
 
 void xmmstimid_conf_ok(GtkButton *button, gpointer user_data) {
-	ConfigDb *db;
+	mcs_handle_t *db;
 
 	if (gtk_toggle_button_get_active(xmmstimid_conf_rate_11000))
 		xmmstimid_cfg.rate = 11000;
--- a/src/vorbis/configure.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/vorbis/configure.c	Wed Apr 09 15:48:36 2008 +0300
@@ -24,7 +24,7 @@
 static void
 vorbis_configurewin_ok(GtkWidget * widget, gpointer data)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
     GtkToggleButton *tb;
 
 	if (vorbis_cfg.tag_format != NULL)
--- a/src/vorbis/vorbis.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/vorbis/vorbis.c	Wed Apr 09 15:48:36 2008 +0300
@@ -705,7 +705,7 @@
 static void
 vorbis_init(void)
 {
-    ConfigDb *db;
+    mcs_handle_t *db;
     gchar *tmp = NULL;
 
     memset(&vorbis_cfg, 0, sizeof(vorbis_config_t));
--- a/src/vtx/vtx.c	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/vtx/vtx.c	Wed Apr 09 15:48:36 2008 +0300
@@ -56,7 +56,7 @@
 void
 vtx_init(void)
 {
-        ConfigDb *db;
+        mcs_handle_t *db;
         db = aud_cfg_db_open();
 
         aud_cfg_db_get_int(db, NULL, "src_rate", &freq);
--- a/src/wavpack/libwavpack.cxx	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/wavpack/libwavpack.cxx	Wed Apr 09 15:48:36 2008 +0300
@@ -548,7 +548,7 @@
 static void
 wv_load_config()
 {
-    ConfigDb *cfg;
+    mcs_handle_t *cfg;
 
     cfg = aud_cfg_db_open();
 
--- a/src/wavpack/ui.cxx	Wed Apr 09 13:31:10 2008 +0300
+++ b/src/wavpack/ui.cxx	Wed Apr 09 15:48:36 2008 +0300
@@ -417,7 +417,7 @@
 static void
 wv_configurewin_ok(GtkWidget * widget, gpointer data)
 {
-    ConfigDb *cfg;
+    mcs_handle_t *cfg;
     GtkToggleButton *tb;
 
     tb = GTK_TOGGLE_BUTTON(rg_switch);