# HG changeset patch # User Matti Hamalainen # Date 1193200442 -10800 # Node ID b8da6a0b0da27d7b84df6344909c3b115889aa11 # Parent c349bd73af7120ee925a0f0a1ba0100ecbbed8dc s/bmp_cfg_/aud_cfg_/g diff -r c349bd73af71 -r b8da6a0b0da2 src/CoreAudio/configure.c --- a/src/CoreAudio/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/CoreAudio/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -62,18 +62,18 @@ if (osx_cfg.alt_mixer_device[0] != '/') osx_cfg.use_alt_mixer_device = FALSE; - cfgfile = bmp_cfg_db_open(); + cfgfile = aud_cfg_db_open(); - bmp_cfg_db_set_int(cfgfile, "OSX", "audio_device", osx_cfg.audio_device); - bmp_cfg_db_set_int(cfgfile, "OSX", "mixer_device", osx_cfg.mixer_device); - bmp_cfg_db_set_int(cfgfile, "OSX", "buffer_size", osx_cfg.buffer_size); - bmp_cfg_db_set_int(cfgfile, "OSX", "prebuffer", osx_cfg.prebuffer); - bmp_cfg_db_set_bool(cfgfile,"OSX","use_master",osx_cfg.use_master); - bmp_cfg_db_set_bool(cfgfile, "OSX", "use_alt_audio_device", osx_cfg.use_alt_audio_device); - bmp_cfg_db_set_string(cfgfile, "OSX", "alt_audio_device", osx_cfg.alt_audio_device); - bmp_cfg_db_set_bool(cfgfile, "OSX", "use_alt_mixer_device", osx_cfg.use_alt_mixer_device); - bmp_cfg_db_set_string(cfgfile, "OSX", "alt_mixer_device", osx_cfg.alt_mixer_device); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_set_int(cfgfile, "OSX", "audio_device", osx_cfg.audio_device); + aud_cfg_db_set_int(cfgfile, "OSX", "mixer_device", osx_cfg.mixer_device); + aud_cfg_db_set_int(cfgfile, "OSX", "buffer_size", osx_cfg.buffer_size); + aud_cfg_db_set_int(cfgfile, "OSX", "prebuffer", osx_cfg.prebuffer); + aud_cfg_db_set_bool(cfgfile,"OSX","use_master",osx_cfg.use_master); + aud_cfg_db_set_bool(cfgfile, "OSX", "use_alt_audio_device", osx_cfg.use_alt_audio_device); + aud_cfg_db_set_string(cfgfile, "OSX", "alt_audio_device", osx_cfg.alt_audio_device); + aud_cfg_db_set_bool(cfgfile, "OSX", "use_alt_mixer_device", osx_cfg.use_alt_mixer_device); + aud_cfg_db_set_string(cfgfile, "OSX", "alt_mixer_device", osx_cfg.alt_mixer_device); + aud_cfg_db_close(cfgfile); gtk_widget_destroy(configure_win); } diff -r c349bd73af71 -r b8da6a0b0da2 src/CoreAudio/init.c --- a/src/CoreAudio/init.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/CoreAudio/init.c Wed Oct 24 07:34:02 2007 +0300 @@ -39,17 +39,17 @@ osx_cfg.alt_audio_device = NULL; osx_cfg.use_master=0; - if ((cfgfile = bmp_cfg_db_open())) + if ((cfgfile = aud_cfg_db_open())) { - bmp_cfg_db_get_int(cfgfile, "OSX", "audio_device", &osx_cfg.audio_device); - bmp_cfg_db_get_int(cfgfile, "OSX", "mixer_device", &osx_cfg.mixer_device); - bmp_cfg_db_get_int(cfgfile, "OSX", "buffer_size", &osx_cfg.buffer_size); - bmp_cfg_db_get_int(cfgfile, "OSX", "prebuffer", &osx_cfg.prebuffer); - bmp_cfg_db_get_bool(cfgfile, "OSX", "use_master", &osx_cfg.use_master); - bmp_cfg_db_get_bool(cfgfile, "OSX", "use_alt_audio_device", &osx_cfg.use_alt_audio_device); - bmp_cfg_db_get_string(cfgfile, "OSX", "alt_audio_device", &osx_cfg.alt_audio_device); - bmp_cfg_db_get_bool(cfgfile, "OSX", "use_alt_mixer_device", &osx_cfg.use_alt_mixer_device); - bmp_cfg_db_get_string(cfgfile, "OSX", "alt_mixer_device", &osx_cfg.alt_mixer_device); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_get_int(cfgfile, "OSX", "audio_device", &osx_cfg.audio_device); + aud_cfg_db_get_int(cfgfile, "OSX", "mixer_device", &osx_cfg.mixer_device); + aud_cfg_db_get_int(cfgfile, "OSX", "buffer_size", &osx_cfg.buffer_size); + aud_cfg_db_get_int(cfgfile, "OSX", "prebuffer", &osx_cfg.prebuffer); + aud_cfg_db_get_bool(cfgfile, "OSX", "use_master", &osx_cfg.use_master); + aud_cfg_db_get_bool(cfgfile, "OSX", "use_alt_audio_device", &osx_cfg.use_alt_audio_device); + aud_cfg_db_get_string(cfgfile, "OSX", "alt_audio_device", &osx_cfg.alt_audio_device); + aud_cfg_db_get_bool(cfgfile, "OSX", "use_alt_mixer_device", &osx_cfg.use_alt_mixer_device); + aud_cfg_db_get_string(cfgfile, "OSX", "alt_mixer_device", &osx_cfg.alt_mixer_device); + aud_cfg_db_close(cfgfile); } } diff -r c349bd73af71 -r b8da6a0b0da2 src/OSS/configure.c --- a/src/OSS/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/OSS/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -73,22 +73,22 @@ if (oss_cfg.alt_mixer_device[0] != '/') oss_cfg.use_alt_mixer_device = FALSE; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device); - bmp_cfg_db_set_int(db, "OSS", "mixer_device", oss_cfg.mixer_device); - bmp_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size); - bmp_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer); - bmp_cfg_db_set_bool(db, "OSS", "use_master", oss_cfg.use_master); - bmp_cfg_db_set_bool(db, "OSS", "use_alt_audio_device", + aud_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device); + aud_cfg_db_set_int(db, "OSS", "mixer_device", oss_cfg.mixer_device); + aud_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size); + aud_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer); + aud_cfg_db_set_bool(db, "OSS", "use_master", oss_cfg.use_master); + aud_cfg_db_set_bool(db, "OSS", "use_alt_audio_device", oss_cfg.use_alt_audio_device); - bmp_cfg_db_set_string(db, "OSS", "alt_audio_device", + aud_cfg_db_set_string(db, "OSS", "alt_audio_device", oss_cfg.alt_audio_device); - bmp_cfg_db_set_bool(db, "OSS", "use_alt_mixer_device", + aud_cfg_db_set_bool(db, "OSS", "use_alt_mixer_device", oss_cfg.use_alt_mixer_device); - bmp_cfg_db_set_string(db, "OSS", "alt_mixer_device", + aud_cfg_db_set_string(db, "OSS", "alt_mixer_device", oss_cfg.alt_mixer_device); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static void diff -r c349bd73af71 -r b8da6a0b0da2 src/OSS/init.c --- a/src/OSS/init.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/OSS/init.c Wed Oct 24 07:34:02 2007 +0300 @@ -42,20 +42,20 @@ oss_cfg.alt_audio_device = NULL; oss_cfg.use_master = 0; - if ((db = bmp_cfg_db_open())) { - bmp_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device); - bmp_cfg_db_get_int(db, "OSS", "mixer_device", &oss_cfg.mixer_device); - bmp_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size); - bmp_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer); - bmp_cfg_db_get_bool(db, "OSS", "use_master", &oss_cfg.use_master); - bmp_cfg_db_get_bool(db, "OSS", "use_alt_audio_device", + if ((db = aud_cfg_db_open())) { + aud_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device); + aud_cfg_db_get_int(db, "OSS", "mixer_device", &oss_cfg.mixer_device); + aud_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size); + aud_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer); + aud_cfg_db_get_bool(db, "OSS", "use_master", &oss_cfg.use_master); + aud_cfg_db_get_bool(db, "OSS", "use_alt_audio_device", &oss_cfg.use_alt_audio_device); - bmp_cfg_db_get_string(db, "OSS", "alt_audio_device", + aud_cfg_db_get_string(db, "OSS", "alt_audio_device", &oss_cfg.alt_audio_device); - bmp_cfg_db_get_bool(db, "OSS", "use_alt_mixer_device", + aud_cfg_db_get_bool(db, "OSS", "use_alt_mixer_device", &oss_cfg.use_alt_mixer_device); - bmp_cfg_db_get_string(db, "OSS", "alt_mixer_device", + aud_cfg_db_get_string(db, "OSS", "alt_mixer_device", &oss_cfg.alt_mixer_device); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } } diff -r c349bd73af71 -r b8da6a0b0da2 src/OSS4/OSS4.c --- a/src/OSS4/OSS4.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/OSS4/OSS4.c Wed Oct 24 07:34:02 2007 +0300 @@ -53,9 +53,9 @@ void oss_cleanup(void) { ConfigDb *db; - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "OSS", "saved_volume", vol); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "OSS", "saved_volume", vol); + aud_cfg_db_close(db); if (oss_cfg.alt_audio_device) { free(oss_cfg.alt_audio_device); diff -r c349bd73af71 -r b8da6a0b0da2 src/OSS4/configure.c --- a/src/OSS4/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/OSS4/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -63,17 +63,17 @@ if (oss_cfg.alt_audio_device[0] != '/') oss_cfg.use_alt_audio_device = FALSE; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device); - bmp_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size); - bmp_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer); - bmp_cfg_db_set_bool(db, "OSS", "save_volume", oss_cfg.save_volume); - bmp_cfg_db_set_bool(db, "OSS", "use_alt_audio_device", + aud_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device); + aud_cfg_db_set_int(db, "OSS", "buffer_size", oss_cfg.buffer_size); + aud_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer); + aud_cfg_db_set_bool(db, "OSS", "save_volume", oss_cfg.save_volume); + aud_cfg_db_set_bool(db, "OSS", "use_alt_audio_device", oss_cfg.use_alt_audio_device); - bmp_cfg_db_set_string(db, "OSS", "alt_audio_device", + aud_cfg_db_set_string(db, "OSS", "alt_audio_device", oss_cfg.alt_audio_device); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static void diff -r c349bd73af71 -r b8da6a0b0da2 src/OSS4/init.c --- a/src/OSS4/init.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/OSS4/init.c Wed Oct 24 07:34:02 2007 +0300 @@ -40,17 +40,17 @@ oss_cfg.use_alt_audio_device = FALSE; oss_cfg.alt_audio_device = NULL; - if ((db = bmp_cfg_db_open())) { - bmp_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device); - bmp_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size); - bmp_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer); - bmp_cfg_db_get_bool(db, "OSS", "save_volume", &oss_cfg.save_volume); - bmp_cfg_db_get_bool(db, "OSS", "use_alt_audio_device", + if ((db = aud_cfg_db_open())) { + aud_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device); + aud_cfg_db_get_int(db, "OSS", "buffer_size", &oss_cfg.buffer_size); + aud_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer); + aud_cfg_db_get_bool(db, "OSS", "save_volume", &oss_cfg.save_volume); + aud_cfg_db_get_bool(db, "OSS", "use_alt_audio_device", &oss_cfg.use_alt_audio_device); - bmp_cfg_db_get_string(db, "OSS", "alt_audio_device", + aud_cfg_db_get_string(db, "OSS", "alt_audio_device", &oss_cfg.alt_audio_device); - bmp_cfg_db_get_int(db, "OSS", "saved_volume", &vol); - bmp_cfg_db_close(db); + aud_cfg_db_get_int(db, "OSS", "saved_volume", &vol); + aud_cfg_db_close(db); } //volume gets saved anyway, but is ignored unless "saved_volume" is true if(!oss_cfg.save_volume) diff -r c349bd73af71 -r b8da6a0b0da2 src/adplug/adplug-xmms.cc --- a/src/adplug/adplug-xmms.cc Wed Oct 24 07:32:18 2007 +0300 +++ b/src/adplug/adplug-xmms.cc Wed Oct 24 07:34:02 2007 +0300 @@ -1036,14 +1036,14 @@ adplug_init (void) { dbg_printf ("adplug_init(): open, "); - ConfigDb *db = bmp_cfg_db_open (); + ConfigDb *db = aud_cfg_db_open (); // Read configuration dbg_printf ("read, "); - bmp_cfg_db_get_bool (db, CFG_VERSION, "16bit", (gboolean *) & conf.bit16); - bmp_cfg_db_get_bool (db, CFG_VERSION, "Stereo", (gboolean *) & conf.stereo); - bmp_cfg_db_get_int (db, CFG_VERSION, "Frequency", (gint *) & conf.freq); - bmp_cfg_db_get_bool (db, CFG_VERSION, "Endless", + aud_cfg_db_get_bool (db, CFG_VERSION, "16bit", (gboolean *) & conf.bit16); + aud_cfg_db_get_bool (db, CFG_VERSION, "Stereo", (gboolean *) & conf.stereo); + aud_cfg_db_get_int (db, CFG_VERSION, "Frequency", (gint *) & conf.freq); + aud_cfg_db_get_bool (db, CFG_VERSION, "Endless", (gboolean *) & conf.endless); // Read file type exclusion list @@ -1052,7 +1052,7 @@ gchar *cfgstr = NULL, *exclude = NULL; gboolean cfgread; - cfgread = bmp_cfg_db_get_string (db, CFG_VERSION, "Exclude", &cfgstr); + cfgread = aud_cfg_db_get_string (db, CFG_VERSION, "Exclude", &cfgstr); if (cfgread) { exclude = (char *) malloc (strlen (cfgstr) + 2); strcpy (exclude, cfgstr); @@ -1063,7 +1063,7 @@ free (exclude); free (cfgstr); } } - bmp_cfg_db_close (db); + aud_cfg_db_close (db); // Load database from disk and hand it to AdPlug dbg_printf ("database"); @@ -1088,7 +1088,7 @@ adplug_quit (void) { dbg_printf ("adplug_quit(): open, "); - ConfigDb *db = bmp_cfg_db_open (); + ConfigDb *db = aud_cfg_db_open (); // Close database dbg_printf ("db, "); @@ -1097,10 +1097,10 @@ // Write configuration dbg_printf ("write, "); - bmp_cfg_db_set_bool (db, CFG_VERSION, "16bit", conf.bit16); - bmp_cfg_db_set_bool (db, CFG_VERSION, "Stereo", conf.stereo); - bmp_cfg_db_set_int (db, CFG_VERSION, "Frequency", conf.freq); - bmp_cfg_db_set_bool (db, CFG_VERSION, "Endless", conf.endless); + aud_cfg_db_set_bool (db, CFG_VERSION, "16bit", conf.bit16); + aud_cfg_db_set_bool (db, CFG_VERSION, "Stereo", conf.stereo); + aud_cfg_db_set_int (db, CFG_VERSION, "Frequency", conf.freq); + aud_cfg_db_set_bool (db, CFG_VERSION, "Endless", conf.endless); dbg_printf ("exclude, "); std::string exclude; @@ -1114,11 +1114,11 @@ exclude += (*i)->filetype; } gchar *cfgval = g_strdup (exclude.c_str ()); - bmp_cfg_db_set_string (db, CFG_VERSION, "Exclude", cfgval); + aud_cfg_db_set_string (db, CFG_VERSION, "Exclude", cfgval); free (cfgval); dbg_printf ("close"); - bmp_cfg_db_close (db); + aud_cfg_db_close (db); dbg_printf (".\n"); } diff -r c349bd73af71 -r b8da6a0b0da2 src/alarm/alarm.c --- a/src/alarm/alarm.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/alarm/alarm.c Wed Oct 24 07:34:02 2007 +0300 @@ -177,18 +177,18 @@ DEBUG("alarm_save\n"); - conf = bmp_cfg_db_open(); + conf = aud_cfg_db_open(); /* * update the live values and write them out */ alarm_h = alarm_conf.default_hour = gtk_spin_button_get_value_as_int(alarm_conf.alarm_h); - bmp_cfg_db_set_int(conf, "alarm", "alarm_h", alarm_h); + aud_cfg_db_set_int(conf, "alarm", "alarm_h", alarm_h); alarm_m = alarm_conf.default_min = gtk_spin_button_get_value_as_int(alarm_conf.alarm_m); - bmp_cfg_db_set_int(conf, "alarm", "alarm_m", alarm_m); + aud_cfg_db_set_int(conf, "alarm", "alarm_m", alarm_m); stop_h = @@ -216,20 +216,20 @@ alarm_conf.day[daynum].min = gtk_spin_button_get_value_as_int(alarm_conf.day[daynum].spin_min); - bmp_cfg_db_set_int(conf, "alarm", day_flags[daynum], alarm_conf.day[daynum].flags); - bmp_cfg_db_set_int(conf, "alarm", day_h[daynum], alarm_conf.day[daynum].hour); - bmp_cfg_db_set_int(conf, "alarm", day_m[daynum], alarm_conf.day[daynum].min); + aud_cfg_db_set_int(conf, "alarm", day_flags[daynum], alarm_conf.day[daynum].flags); + aud_cfg_db_set_int(conf, "alarm", day_h[daynum], alarm_conf.day[daynum].hour); + aud_cfg_db_set_int(conf, "alarm", day_m[daynum], alarm_conf.day[daynum].min); } /* END: days of week */ volume = gtk_range_get_adjustment(alarm_conf.volume)->value; - bmp_cfg_db_set_int(conf, "alarm", "volume", volume); + aud_cfg_db_set_int(conf, "alarm", "volume", volume); quietvol = gtk_range_get_adjustment(alarm_conf.quietvol)->value; - bmp_cfg_db_set_int(conf, "alarm", "quietvol", quietvol); + aud_cfg_db_set_int(conf, "alarm", "quietvol", quietvol); fading = gtk_spin_button_get_value_as_int(alarm_conf.fading); @@ -252,38 +252,38 @@ else { /* write the new values */ - bmp_cfg_db_set_int(conf, "alarm", "stop_h", stop_h); - bmp_cfg_db_set_int(conf, "alarm", "stop_m", stop_m); - bmp_cfg_db_set_int(conf, "alarm", "fading", fading); - bmp_cfg_db_set_bool(conf, "alarm", "stop_on", stop_on); + aud_cfg_db_set_int(conf, "alarm", "stop_h", stop_h); + aud_cfg_db_set_int(conf, "alarm", "stop_m", stop_m); + aud_cfg_db_set_int(conf, "alarm", "fading", fading); + aud_cfg_db_set_bool(conf, "alarm", "stop_on", stop_on); } g_free(cmdstr); cmdstr = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.cmdstr), 0, -1); - bmp_cfg_db_set_string(conf, "alarm", "cmdstr", cmdstr); + aud_cfg_db_set_string(conf, "alarm", "cmdstr", cmdstr); cmd_on = gtk_toggle_button_get_active(alarm_conf.cmd_on); - bmp_cfg_db_set_bool(conf, "alarm", "cmd_on", cmd_on); + aud_cfg_db_set_bool(conf, "alarm", "cmd_on", cmd_on); g_free(playlist); playlist = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.playlist), 0, -1); - bmp_cfg_db_set_string(conf, "alarm", "playlist", playlist); + aud_cfg_db_set_string(conf, "alarm", "playlist", playlist); /* reminder */ g_free(alarm_conf.reminder_msg); alarm_conf.reminder_msg = gtk_editable_get_chars(GTK_EDITABLE(alarm_conf.reminder), 0, -1); - bmp_cfg_db_set_string(conf, "alarm", "reminder_msg", alarm_conf.reminder_msg); + aud_cfg_db_set_string(conf, "alarm", "reminder_msg", alarm_conf.reminder_msg); alarm_conf.reminder_on = gtk_toggle_button_get_active(alarm_conf.reminder_cb); - bmp_cfg_db_set_bool(conf, "alarm", "reminder_on", alarm_conf.reminder_on); + aud_cfg_db_set_bool(conf, "alarm", "reminder_on", alarm_conf.reminder_on); - bmp_cfg_db_close(conf); + aud_cfg_db_close(conf); } /* @@ -296,50 +296,50 @@ DEBUG("alarm_read_config\n"); - conf = bmp_cfg_db_open(); + conf = aud_cfg_db_open(); - if(!bmp_cfg_db_get_int(conf, "alarm", "alarm_h", &alarm_h)) + if(!aud_cfg_db_get_int(conf, "alarm", "alarm_h", &alarm_h)) alarm_h = DEFAULT_ALARM_HOUR; - if(!bmp_cfg_db_get_int(conf, "alarm", "alarm_m", &alarm_m)) + if(!aud_cfg_db_get_int(conf, "alarm", "alarm_m", &alarm_m)) alarm_m = DEFAULT_ALARM_MIN; /* save them here too */ alarm_conf.default_hour = alarm_h; alarm_conf.default_min = alarm_m; - if(!bmp_cfg_db_get_int( conf, "alarm", "stop_h", &stop_h)) + if(!aud_cfg_db_get_int( conf, "alarm", "stop_h", &stop_h)) stop_h = DEFAULT_STOP_HOURS; - if(!bmp_cfg_db_get_int( conf, "alarm", "stop_m", &stop_m)) + if(!aud_cfg_db_get_int( conf, "alarm", "stop_m", &stop_m)) stop_m = DEFAULT_STOP_MINS; - if(!bmp_cfg_db_get_bool(conf, "alarm", "stop_on", &stop_on)) + if(!aud_cfg_db_get_bool(conf, "alarm", "stop_on", &stop_on)) stop_on = TRUE; - if(!bmp_cfg_db_get_int(conf, "alarm", "volume", &volume)) + if(!aud_cfg_db_get_int(conf, "alarm", "volume", &volume)) volume = DEFAULT_VOLUME; - if(!bmp_cfg_db_get_int(conf, "alarm", "quietvol", &quietvol)) + if(!aud_cfg_db_get_int(conf, "alarm", "quietvol", &quietvol)) quietvol = DEFAULT_QUIET_VOL; - if(!bmp_cfg_db_get_int(conf, "alarm", "fading", &fading)) + if(!aud_cfg_db_get_int(conf, "alarm", "fading", &fading)) fading = DEFAULT_FADING; - if(!bmp_cfg_db_get_string(conf, "alarm", "cmdstr", &cmdstr)) + if(!aud_cfg_db_get_string(conf, "alarm", "cmdstr", &cmdstr)) cmdstr = g_strdup(""); - if(!bmp_cfg_db_get_bool(conf, "alarm", "cmd_on", &cmd_on)) + if(!aud_cfg_db_get_bool(conf, "alarm", "cmd_on", &cmd_on)) cmd_on = FALSE; - if(!bmp_cfg_db_get_string(conf, "alarm", "playlist", &playlist)) + if(!aud_cfg_db_get_string(conf, "alarm", "playlist", &playlist)) playlist = g_strdup(""); - if(!bmp_cfg_db_get_string(conf, "alarm", "reminder_msg", &alarm_conf.reminder_msg)) + if(!aud_cfg_db_get_string(conf, "alarm", "reminder_msg", &alarm_conf.reminder_msg)) alarm_conf.reminder_msg = g_strdup(""); - if(!bmp_cfg_db_get_bool(conf, "alarm", "reminder_on", &alarm_conf.reminder_on)) + if(!aud_cfg_db_get_bool(conf, "alarm", "reminder_on", &alarm_conf.reminder_on)) alarm_conf.reminder_on = FALSE; /* day flags and times */ for(; daynum < 7; daynum++) { /* read the flags */ - if(!bmp_cfg_db_get_int(conf, "alarm", day_flags[daynum], &alarm_conf.day[daynum].flags)) { + if(!aud_cfg_db_get_int(conf, "alarm", day_flags[daynum], &alarm_conf.day[daynum].flags)) { // only turn alarm off by default on a sunday if(daynum != 0) alarm_conf.day[daynum].flags = DEFAULT_FLAGS; @@ -348,10 +348,10 @@ } /* read the times */ - if(!bmp_cfg_db_get_int(conf, "alarm", day_h[daynum], &alarm_conf.day[daynum].hour)) + if(!aud_cfg_db_get_int(conf, "alarm", day_h[daynum], &alarm_conf.day[daynum].hour)) alarm_conf.day[daynum].hour = DEFAULT_ALARM_HOUR; - if(!bmp_cfg_db_get_int(conf, "alarm", day_m[daynum], &alarm_conf.day[daynum].min)) + if(!aud_cfg_db_get_int(conf, "alarm", day_m[daynum], &alarm_conf.day[daynum].min)) alarm_conf.day[daynum].min = DEFAULT_ALARM_MIN; } diff -r c349bd73af71 -r b8da6a0b0da2 src/alsa/configure.c --- a/src/alsa/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/alsa/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -46,16 +46,16 @@ void alsa_save_config(void) { - ConfigDb *cfgfile = bmp_cfg_db_open(); + ConfigDb *cfgfile = aud_cfg_db_open(); - bmp_cfg_db_set_int(cfgfile, "ALSA", "buffer_time", alsa_cfg.buffer_time); - bmp_cfg_db_set_int(cfgfile, "ALSA", "period_time", alsa_cfg.period_time); - bmp_cfg_db_set_string(cfgfile,"ALSA","pcm_device", alsa_cfg.pcm_device); - bmp_cfg_db_set_int(cfgfile, "ALSA", "mixer_card", alsa_cfg.mixer_card); - bmp_cfg_db_set_string(cfgfile,"ALSA","mixer_device", alsa_cfg.mixer_device); - bmp_cfg_db_set_int(cfgfile, "ALSA", "volume_left", alsa_cfg.vol.left); - bmp_cfg_db_set_int(cfgfile, "ALSA", "volume_right", alsa_cfg.vol.right); - bmp_cfg_db_close(cfgfile); + 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); + aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", alsa_cfg.pcm_device); + aud_cfg_db_set_int(cfgfile, "ALSA", "mixer_card", alsa_cfg.mixer_card); + aud_cfg_db_set_string(cfgfile,"ALSA","mixer_device", alsa_cfg.mixer_device); + aud_cfg_db_set_int(cfgfile, "ALSA", "volume_left", alsa_cfg.vol.left); + aud_cfg_db_set_int(cfgfile, "ALSA", "volume_right", alsa_cfg.vol.right); + aud_cfg_db_close(cfgfile); } static int get_cards(GtkOptionMenu *omenu, GtkSignalFunc cb, int active) diff -r c349bd73af71 -r b8da6a0b0da2 src/alsa/init.c --- a/src/alsa/init.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/alsa/init.c Wed Oct 24 07:34:02 2007 +0300 @@ -35,20 +35,20 @@ alsa_cfg.vol.left = 100; alsa_cfg.vol.right = 100; - cfgfile = bmp_cfg_db_open(); - if (!bmp_cfg_db_get_string(cfgfile, "ALSA", "pcm_device", + cfgfile = aud_cfg_db_open(); + if (!aud_cfg_db_get_string(cfgfile, "ALSA", "pcm_device", &alsa_cfg.pcm_device)) alsa_cfg.pcm_device = g_strdup("default"); g_message("device: %s", alsa_cfg.pcm_device); - if (!bmp_cfg_db_get_string(cfgfile, "ALSA", "mixer_device", + if (!aud_cfg_db_get_string(cfgfile, "ALSA", "mixer_device", &alsa_cfg.mixer_device)) alsa_cfg.mixer_device = g_strdup("PCM"); - bmp_cfg_db_get_int(cfgfile, "ALSA", "mixer_card", &alsa_cfg.mixer_card); - bmp_cfg_db_get_int(cfgfile, "ALSA", "buffer_time", &alsa_cfg.buffer_time); - bmp_cfg_db_get_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time); + aud_cfg_db_get_int(cfgfile, "ALSA", "mixer_card", &alsa_cfg.mixer_card); + aud_cfg_db_get_int(cfgfile, "ALSA", "buffer_time", &alsa_cfg.buffer_time); + aud_cfg_db_get_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time); - bmp_cfg_db_get_bool(cfgfile, "ALSA", "debug", &alsa_cfg.debug); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_get_bool(cfgfile, "ALSA", "debug", &alsa_cfg.debug); + aud_cfg_db_close(cfgfile); if (dlopen("libasound.so.2", RTLD_NOW | RTLD_GLOBAL) == NULL) { diff -r c349bd73af71 -r b8da6a0b0da2 src/aosd/aosd_cfg.c --- a/src/aosd/aosd_cfg.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/aosd/aosd_cfg.c Wed Oct 24 07:34:02 2007 +0300 @@ -222,42 +222,42 @@ gint aosd_cfg_load ( aosd_cfg_t * cfg ) { - ConfigDb *cfgfile = bmp_cfg_db_open(); + ConfigDb *cfgfile = aud_cfg_db_open(); gint i = 0; gint max_numcol; gchar *trig_active_str; /* position */ - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "position_placement" , &(cfg->osd->position.placement) ) ) cfg->osd->position.placement = AOSD_POSITION_PLACEMENT_TOPLEFT; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "position_offset_x" , &(cfg->osd->position.offset_x) ) ) cfg->osd->position.offset_x = 0; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "position_offset_y" , &(cfg->osd->position.offset_y) ) ) cfg->osd->position.offset_y = 0; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "position_maxsize_width" , &(cfg->osd->position.maxsize_width) ) ) cfg->osd->position.maxsize_width = 0; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "position_multimon_id" , &(cfg->osd->position.multimon_id) ) ) cfg->osd->position.multimon_id = -1; /* animation */ - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "animation_timing_display" , &(cfg->osd->animation.timing_display) ) ) cfg->osd->animation.timing_display = 3000; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "animation_timing_fadein" , &(cfg->osd->animation.timing_fadein) ) ) cfg->osd->animation.timing_fadein = 300; - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "animation_timing_fadeout" , &(cfg->osd->animation.timing_fadeout) ) ) cfg->osd->animation.timing_fadeout = 300; @@ -267,38 +267,38 @@ gchar *color_str = NULL; gchar *key_str = NULL; key_str = g_strdup_printf( "text_fonts_name_%i" , i ); - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_name[i]) ) ) + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_name[i]) ) ) cfg->osd->text.fonts_name[i] = g_strdup( "Sans 26" ); g_free( key_str ); key_str = g_strdup_printf( "text_fonts_color_%i" , i ); - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) color_str = g_strdup( "65535,65535,65535,65535" ); /* white , alpha 100% */ aosd_cfg_util_str_to_color( color_str , &(cfg->osd->text.fonts_color[i]) ); g_free( key_str ); g_free( color_str ); key_str = g_strdup_printf( "text_fonts_draw_shadow_%i" , i ); - if ( !bmp_cfg_db_get_bool( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_draw_shadow[i]) ) ) + if ( !aud_cfg_db_get_bool( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_draw_shadow[i]) ) ) cfg->osd->text.fonts_draw_shadow[i] = TRUE; g_free( key_str ); key_str = g_strdup_printf( "text_fonts_shadow_color_%i" , i ); - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) color_str = g_strdup( "0,0,0,32767" ); /* black , alpha 50% */ aosd_cfg_util_str_to_color( color_str , &(cfg->osd->text.fonts_shadow_color[i]) ); g_free( key_str ); g_free( color_str ); } - if ( !bmp_cfg_db_get_bool( cfgfile , "aosd" , + if ( !aud_cfg_db_get_bool( cfgfile , "aosd" , "text_utf8conv_disable" , &(cfg->osd->text.utf8conv_disable) ) ) cfg->osd->text.utf8conv_disable = FALSE; /* decoration */ - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "decoration_code" , &(cfg->osd->decoration.code) ) ) cfg->osd->decoration.code = aosd_deco_style_get_first_code(); /* TODO not implemented yet - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , "decoration_skin_file" , &(cfg->osd->decoration.skin_file) ) ) cfg->osd->decoration.skin_file = g_strdup( "" ); */ @@ -311,7 +311,7 @@ gchar *color_str = NULL; aosd_color_t color; key_str = g_strdup_printf( "decoration_color_%i" , i ); - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) ) { /* we have different default values for the decoration colors */ switch ( i ) @@ -335,7 +335,7 @@ } /* trigger */ - if ( !bmp_cfg_db_get_string( cfgfile , "aosd" , "trigger_active" , &trig_active_str ) ) + if ( !aud_cfg_db_get_string( cfgfile , "aosd" , "trigger_active" , &trig_active_str ) ) { gint trig_active_defval = 0; g_array_append_val( cfg->osd->trigger.active , trig_active_defval ); @@ -354,11 +354,11 @@ } /* miscellanous */ - if ( !bmp_cfg_db_get_int( cfgfile , "aosd" , + if ( !aud_cfg_db_get_int( cfgfile , "aosd" , "transparency_mode" , &(cfg->osd->misc.transparency_mode) ) ) cfg->osd->misc.transparency_mode = AOSD_MISC_TRANSPARENCY_FAKE; - bmp_cfg_db_close( cfgfile ); + aud_cfg_db_close( cfgfile ); /* the config object has been filled with information */ cfg->set = TRUE; @@ -370,7 +370,7 @@ gint aosd_cfg_save ( aosd_cfg_t * cfg ) { - ConfigDb *cfgfile = bmp_cfg_db_open(); + ConfigDb *cfgfile = aud_cfg_db_open(); gint i = 0; gint max_numcol; GString *string = g_string_new( "" ); @@ -379,29 +379,29 @@ return -1; /* position */ - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "position_placement" , cfg->osd->position.placement ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "position_offset_x" , cfg->osd->position.offset_x ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "position_offset_y" , cfg->osd->position.offset_y ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "position_maxsize_width" , cfg->osd->position.maxsize_width ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "position_multimon_id" , cfg->osd->position.multimon_id ); /* animation */ - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "animation_timing_display" , cfg->osd->animation.timing_display ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "animation_timing_fadein" , cfg->osd->animation.timing_fadein ); - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "animation_timing_fadeout" , cfg->osd->animation.timing_fadeout ); /* text */ @@ -410,36 +410,36 @@ gchar *color_str = NULL; gchar *key_str = NULL; key_str = g_strdup_printf( "text_fonts_name_%i" , i ); - bmp_cfg_db_set_string( cfgfile , "aosd" , + aud_cfg_db_set_string( cfgfile , "aosd" , key_str , cfg->osd->text.fonts_name[i] ); g_free( key_str ); key_str = g_strdup_printf( "text_fonts_color_%i" , i ); aosd_cfg_util_color_to_str( cfg->osd->text.fonts_color[i] , &color_str ); - bmp_cfg_db_set_string( cfgfile , "aosd" , + aud_cfg_db_set_string( cfgfile , "aosd" , key_str , color_str ); g_free( key_str ); g_free( color_str ); key_str = g_strdup_printf( "text_fonts_draw_shadow_%i" , i ); - bmp_cfg_db_set_bool( cfgfile , "aosd" , + aud_cfg_db_set_bool( cfgfile , "aosd" , key_str , cfg->osd->text.fonts_draw_shadow[i] ); g_free( key_str ); key_str = g_strdup_printf( "text_fonts_shadow_color_%i" , i ); aosd_cfg_util_color_to_str( cfg->osd->text.fonts_shadow_color[i] , &color_str ); - bmp_cfg_db_set_string( cfgfile , "aosd" , + aud_cfg_db_set_string( cfgfile , "aosd" , key_str , color_str ); g_free( key_str ); g_free( color_str ); } - bmp_cfg_db_set_bool( cfgfile , "aosd" , + aud_cfg_db_set_bool( cfgfile , "aosd" , "text_utf8conv_disable" , cfg->osd->text.utf8conv_disable ); /* decoration */ - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "decoration_code" , cfg->osd->decoration.code ); /* TODO skip this since it's not implemented yet - bmp_cfg_db_set_string( cfgfile , "aosd" , + aud_cfg_db_set_string( cfgfile , "aosd" , "decoration_skin_file" , cfg->osd->decoration.skin_file ); */ /* decoration - colors */ @@ -451,7 +451,7 @@ aosd_color_t color = g_array_index( cfg->osd->decoration.colors , aosd_color_t , i ); key_str = g_strdup_printf( "decoration_color_%i" , i ); aosd_cfg_util_color_to_str( color , &color_str ); - bmp_cfg_db_set_string( cfgfile , "aosd" , + aud_cfg_db_set_string( cfgfile , "aosd" , key_str , color_str ); g_free( key_str ); g_free( color_str ); @@ -464,14 +464,14 @@ g_string_truncate( string , string->len - 1 ); else g_string_assign( string , "x" ); - bmp_cfg_db_set_string( cfgfile , "aosd" , "trigger_active" , string->str ); + aud_cfg_db_set_string( cfgfile , "aosd" , "trigger_active" , string->str ); g_string_free( string , TRUE ); /* miscellaneous */ - bmp_cfg_db_set_int( cfgfile , "aosd" , + aud_cfg_db_set_int( cfgfile , "aosd" , "transparency_mode" , cfg->osd->misc.transparency_mode ); - bmp_cfg_db_close( cfgfile ); + aud_cfg_db_close( cfgfile ); return 0; } diff -r c349bd73af71 -r b8da6a0b0da2 src/arts/audio.c --- a/src/arts/audio.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/arts/audio.c Wed Oct 24 07:34:02 2007 +0300 @@ -62,10 +62,10 @@ artsxmms_cfg.buffer_size = 400; - db = bmp_cfg_db_open(); - bmp_cfg_db_get_int(db, "arts", "buffer_size", + db = aud_cfg_db_open(); + aud_cfg_db_get_int(db, "arts", "buffer_size", &artsxmms_cfg.buffer_size); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } diff -r c349bd73af71 -r b8da6a0b0da2 src/arts/configure.c --- a/src/arts/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/arts/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -23,9 +23,9 @@ artsxmms_cfg.buffer_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_size_spin)); - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "arts", "buffer_size", artsxmms_cfg.buffer_size); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "arts", "buffer_size", artsxmms_cfg.buffer_size); + aud_cfg_db_close(db); gtk_widget_destroy(configure_win); } diff -r c349bd73af71 -r b8da6a0b0da2 src/audiocompress/audacious-glue.c --- a/src/audiocompress/audacious-glue.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/audiocompress/audacious-glue.c Wed Oct 24 07:34:02 2007 +0300 @@ -122,20 +122,20 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_get_bool(db, "AudioCompress", + aud_cfg_db_get_bool(db, "AudioCompress", "anticlip", &prefs->anticlip); - bmp_cfg_db_get_int(db, "AudioCompress", "target", + aud_cfg_db_get_int(db, "AudioCompress", "target", &prefs->target); - bmp_cfg_db_get_int(db, "AudioCompress", "gainmax", + aud_cfg_db_get_int(db, "AudioCompress", "gainmax", &prefs->gainmax); - bmp_cfg_db_get_int(db, "AudioCompress", + aud_cfg_db_get_int(db, "AudioCompress", "gainsmooth", &prefs->gainsmooth); - bmp_cfg_db_get_int(db, "AudioCompress", "buckets", + aud_cfg_db_get_int(db, "AudioCompress", "buckets", &prefs->buckets); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); if ((prefs->gainmax == 0) && (prefs->gainsmooth == 0) && (prefs->buckets == 0)) { prefs->anticlip = ANTICLIP; @@ -161,20 +161,20 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_bool(db, "AudioCompress", "anticlip", + aud_cfg_db_set_bool(db, "AudioCompress", "anticlip", prefs->anticlip); - bmp_cfg_db_set_int(db, "AudioCompress", "target", + aud_cfg_db_set_int(db, "AudioCompress", "target", prefs->target); - bmp_cfg_db_set_int(db, "AudioCompress", "gainmax", + aud_cfg_db_set_int(db, "AudioCompress", "gainmax", prefs->gainmax); - bmp_cfg_db_set_int(db, "AudioCompress", "gainsmooth", + aud_cfg_db_set_int(db, "AudioCompress", "gainsmooth", prefs->gainsmooth); - bmp_cfg_db_set_int(db, "AudioCompress", "buckets", + aud_cfg_db_set_int(db, "AudioCompress", "buckets", prefs->buckets); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } diff -r c349bd73af71 -r b8da6a0b0da2 src/blur_scope/blur_scope.c --- a/src/blur_scope/blur_scope.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/blur_scope/blur_scope.c Wed Oct 24 07:34:02 2007 +0300 @@ -99,12 +99,12 @@ if (!config_read) { bscope_cfg.color = 0xFF3F7F; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); if (db) { - bmp_cfg_db_get_int(db, "BlurScope", "color", + aud_cfg_db_get_int(db, "BlurScope", "color", (int *) &bscope_cfg.color); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } config_read = TRUE; } diff -r c349bd73af71 -r b8da6a0b0da2 src/blur_scope/config.c --- a/src/blur_scope/config.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/blur_scope/config.c Wed Oct 24 07:34:02 2007 +0300 @@ -25,9 +25,9 @@ bscope_cfg.color = ((guint32) (255.0 * color[0]) << 16) | ((guint32) (255.0 * color[1]) << 8) | ((guint32) (255.0 * color[2])); - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "BlurScope", "color", bscope_cfg.color); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "BlurScope", "color", bscope_cfg.color); + aud_cfg_db_close(db); generate_cmap(); gtk_widget_destroy(configure_win); } diff -r c349bd73af71 -r b8da6a0b0da2 src/console/Audacious_Config.cxx --- a/src/console/Audacious_Config.cxx Wed Oct 24 07:32:18 2007 +0300 +++ b/src/console/Audacious_Config.cxx Wed Oct 24 07:34:02 2007 +0300 @@ -21,31 +21,31 @@ void console_cfg_load( void ) { - ConfigDb *db = bmp_cfg_db_open(); - bmp_cfg_db_get_int(db, "console", "loop_length", &audcfg.loop_length); - bmp_cfg_db_get_bool(db, "console", "resample", &audcfg.resample); - bmp_cfg_db_get_int(db, "console", "resample_rate", &audcfg.resample_rate); - bmp_cfg_db_get_int(db, "console", "treble", &audcfg.treble); - bmp_cfg_db_get_int(db, "console", "bass", &audcfg.bass); - bmp_cfg_db_get_bool(db, "console", "ignore_spc_length", &audcfg.ignore_spc_length); - bmp_cfg_db_get_int(db, "console", "echo", &audcfg.echo); - bmp_cfg_db_get_bool(db, "console", "inc_spc_reverb", &audcfg.inc_spc_reverb); - bmp_cfg_db_close(db); + ConfigDb *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); + aud_cfg_db_get_int(db, "console", "treble", &audcfg.treble); + aud_cfg_db_get_int(db, "console", "bass", &audcfg.bass); + aud_cfg_db_get_bool(db, "console", "ignore_spc_length", &audcfg.ignore_spc_length); + aud_cfg_db_get_int(db, "console", "echo", &audcfg.echo); + aud_cfg_db_get_bool(db, "console", "inc_spc_reverb", &audcfg.inc_spc_reverb); + aud_cfg_db_close(db); } void console_cfg_save( void ) { - ConfigDb *db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "console", "loop_length", audcfg.loop_length); - bmp_cfg_db_set_bool(db, "console", "resample", audcfg.resample); - bmp_cfg_db_set_int(db, "console", "resample_rate", audcfg.resample_rate); - bmp_cfg_db_set_int(db, "console", "treble", audcfg.treble); - bmp_cfg_db_set_int(db, "console", "bass", audcfg.bass); - bmp_cfg_db_set_bool(db, "console", "ignore_spc_length", audcfg.ignore_spc_length); - bmp_cfg_db_set_int(db, "console", "echo", audcfg.echo); - bmp_cfg_db_set_bool(db, "console", "inc_spc_reverb", audcfg.inc_spc_reverb); - bmp_cfg_db_close(db); + ConfigDb *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); + aud_cfg_db_set_int(db, "console", "treble", audcfg.treble); + aud_cfg_db_set_int(db, "console", "bass", audcfg.bass); + aud_cfg_db_set_bool(db, "console", "ignore_spc_length", audcfg.ignore_spc_length); + aud_cfg_db_set_int(db, "console", "echo", audcfg.echo); + aud_cfg_db_set_bool(db, "console", "inc_spc_reverb", audcfg.inc_spc_reverb); + aud_cfg_db_close(db); } diff -r c349bd73af71 -r b8da6a0b0da2 src/echo_plugin/echo.c --- a/src/echo_plugin/echo.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/echo_plugin/echo.c Wed Oct 24 07:34:02 2007 +0300 @@ -47,12 +47,12 @@ if (sizeof(short) != sizeof(gint16)) abort(); - cfg = bmp_cfg_db_open(); - bmp_cfg_db_get_int(cfg, "echo_plugin", "delay", &echo_delay); - bmp_cfg_db_get_int(cfg, "echo_plugin", "feedback", &echo_feedback); - bmp_cfg_db_get_int(cfg, "echo_plugin", "volume", &echo_volume); - bmp_cfg_db_get_bool(cfg, "echo_plugin", "enable_surround", &echo_surround_enable); - bmp_cfg_db_close(cfg); + cfg = aud_cfg_db_open(); + aud_cfg_db_get_int(cfg, "echo_plugin", "delay", &echo_delay); + aud_cfg_db_get_int(cfg, "echo_plugin", "feedback", &echo_feedback); + aud_cfg_db_get_int(cfg, "echo_plugin", "volume", &echo_volume); + aud_cfg_db_get_bool(cfg, "echo_plugin", "enable_surround", &echo_surround_enable); + aud_cfg_db_close(cfg); } static void cleanup(void) diff -r c349bd73af71 -r b8da6a0b0da2 src/echo_plugin/gui.c --- a/src/echo_plugin/gui.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/echo_plugin/gui.c Wed Oct 24 07:34:02 2007 +0300 @@ -39,12 +39,12 @@ echo_surround_enable = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(surround_btn)); - cfg = bmp_cfg_db_open(); - bmp_cfg_db_set_int(cfg, "echo_plugin", "delay", echo_delay); - bmp_cfg_db_set_int(cfg, "echo_plugin", "feedback", echo_feedback); - bmp_cfg_db_set_int(cfg, "echo_plugin", "volume", echo_volume); - bmp_cfg_db_set_bool(cfg, "echo_plugin", "enable_surround", echo_surround_enable); - bmp_cfg_db_close(cfg); + cfg = aud_cfg_db_open(); + aud_cfg_db_set_int(cfg, "echo_plugin", "delay", echo_delay); + aud_cfg_db_set_int(cfg, "echo_plugin", "feedback", echo_feedback); + aud_cfg_db_set_int(cfg, "echo_plugin", "volume", echo_volume); + aud_cfg_db_set_bool(cfg, "echo_plugin", "enable_surround", echo_surround_enable); + aud_cfg_db_close(cfg); } static void conf_ok_cb(GtkButton * button, gpointer data) diff -r c349bd73af71 -r b8da6a0b0da2 src/esd/configure.c --- a/src/esd/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/esd/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -53,15 +53,15 @@ esd_cfg.prebuffer = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_pre_spin)); - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_bool(db, "ESD", "use_remote", esd_cfg.use_remote); - bmp_cfg_db_set_bool(db, "ESD", "use_oss_mixer", esd_cfg.use_oss_mixer); - bmp_cfg_db_set_string(db, "ESD", "remote_host", esd_cfg.server); - bmp_cfg_db_set_int(db, "ESD", "remote_port", esd_cfg.port); - bmp_cfg_db_set_int(db, "ESD", "buffer_size", esd_cfg.buffer_size); - bmp_cfg_db_set_int(db, "ESD", "prebuffer", esd_cfg.prebuffer); - bmp_cfg_db_close(db); + aud_cfg_db_set_bool(db, "ESD", "use_remote", esd_cfg.use_remote); + aud_cfg_db_set_bool(db, "ESD", "use_oss_mixer", esd_cfg.use_oss_mixer); + aud_cfg_db_set_string(db, "ESD", "remote_host", esd_cfg.server); + aud_cfg_db_set_int(db, "ESD", "remote_port", esd_cfg.port); + aud_cfg_db_set_int(db, "ESD", "buffer_size", esd_cfg.buffer_size); + aud_cfg_db_set_int(db, "ESD", "prebuffer", esd_cfg.prebuffer); + aud_cfg_db_close(db); } diff -r c349bd73af71 -r b8da6a0b0da2 src/esd/init.c --- a/src/esd/init.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/esd/init.c Wed Oct 24 07:34:02 2007 +0300 @@ -41,7 +41,7 @@ esd_cfg.buffer_size = 3000; esd_cfg.prebuffer = 25; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); if ((env = getenv("ESPEAKER")) != NULL) { char *temp; @@ -56,20 +56,20 @@ } } else { - bmp_cfg_db_get_bool(db, "ESD", "use_remote", &esd_cfg.use_remote); - bmp_cfg_db_get_string(db, "ESD", "remote_host", &esd_cfg.server); - bmp_cfg_db_get_int(db, "ESD", "remote_port", &esd_cfg.port); + aud_cfg_db_get_bool(db, "ESD", "use_remote", &esd_cfg.use_remote); + aud_cfg_db_get_string(db, "ESD", "remote_host", &esd_cfg.server); + aud_cfg_db_get_int(db, "ESD", "remote_port", &esd_cfg.port); } - bmp_cfg_db_get_bool(db, "ESD", "use_oss_mixer", &esd_cfg.use_oss_mixer); - bmp_cfg_db_get_int(db, "ESD", "buffer_size", &esd_cfg.buffer_size); - bmp_cfg_db_get_int(db, "ESD", "prebuffer", &esd_cfg.prebuffer); + aud_cfg_db_get_bool(db, "ESD", "use_oss_mixer", &esd_cfg.use_oss_mixer); + aud_cfg_db_get_int(db, "ESD", "buffer_size", &esd_cfg.buffer_size); + aud_cfg_db_get_int(db, "ESD", "prebuffer", &esd_cfg.prebuffer); /* restore volume levels */ - bmp_cfg_db_get_int(db, "ESD", "volume_left", &lp); - bmp_cfg_db_get_int(db, "ESD", "volume_right", &rp); + aud_cfg_db_get_int(db, "ESD", "volume_left", &lp); + aud_cfg_db_get_int(db, "ESD", "volume_right", &rp); esdout_set_volume(lp, rp); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); if (!esd_cfg.server) esd_cfg.server = g_strdup("localhost"); diff -r c349bd73af71 -r b8da6a0b0da2 src/esd/mixer.c --- a/src/esd/mixer.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/esd/mixer.c Wed Oct 24 07:34:02 2007 +0300 @@ -160,10 +160,10 @@ } /* save volume values in db */ - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "ESD", "volume_left", lp); - bmp_cfg_db_set_int(db, "ESD", "volume_right", rp); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "ESD", "volume_left", lp); + aud_cfg_db_set_int(db, "ESD", "volume_right", rp); + aud_cfg_db_close(db); } #ifdef HAVE_OSS diff -r c349bd73af71 -r b8da6a0b0da2 src/filewriter/filewriter.c --- a/src/filewriter/filewriter.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/filewriter/filewriter.c Wed Oct 24 07:34:02 2007 +0300 @@ -136,14 +136,14 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); - bmp_cfg_db_get_int(db, "filewriter", "fileext", &fileext); - bmp_cfg_db_get_string(db, "filewriter", "file_path", &file_path); - bmp_cfg_db_get_bool(db, "filewriter", "save_original", &save_original); - bmp_cfg_db_get_bool(db, "filewriter", "use_suffix", &use_suffix); - bmp_cfg_db_get_bool(db, "filewriter", "filenamefromtags", &filenamefromtags); - bmp_cfg_db_get_bool(db, "filewriter", "prependnumber", &prependnumber); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_get_int(db, "filewriter", "fileext", &fileext); + aud_cfg_db_get_string(db, "filewriter", "file_path", &file_path); + aud_cfg_db_get_bool(db, "filewriter", "save_original", &save_original); + aud_cfg_db_get_bool(db, "filewriter", "use_suffix", &use_suffix); + aud_cfg_db_get_bool(db, "filewriter", "filenamefromtags", &filenamefromtags); + aud_cfg_db_get_bool(db, "filewriter", "prependnumber", &prependnumber); + aud_cfg_db_close(db); if (!file_path) file_path = g_strdup(g_get_home_dir()); @@ -383,15 +383,15 @@ prependnumber = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prependnumber_toggle)); - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "filewriter", "fileext", fileext); - bmp_cfg_db_set_string(db, "filewriter", "file_path", file_path); - bmp_cfg_db_set_bool(db, "filewriter", "save_original", save_original); - bmp_cfg_db_set_bool(db, "filewriter", "filenamefromtags", filenamefromtags); - bmp_cfg_db_set_bool(db, "filewriter", "use_suffix", use_suffix); - bmp_cfg_db_set_bool(db, "filewriter", "prependnumber", prependnumber); + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "filewriter", "fileext", fileext); + aud_cfg_db_set_string(db, "filewriter", "file_path", file_path); + aud_cfg_db_set_bool(db, "filewriter", "save_original", save_original); + aud_cfg_db_set_bool(db, "filewriter", "filenamefromtags", filenamefromtags); + aud_cfg_db_set_bool(db, "filewriter", "use_suffix", use_suffix); + aud_cfg_db_set_bool(db, "filewriter", "prependnumber", prependnumber); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_widget_destroy(configure_win); if (path_dirbrowser) diff -r c349bd73af71 -r b8da6a0b0da2 src/filewriter/mp3.c --- a/src/filewriter/mp3.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/filewriter/mp3.c Wed Oct 24 07:34:02 2007 +0300 @@ -160,40 +160,40 @@ static void mp3_init(void) { - ConfigDb *db = bmp_cfg_db_open(); - bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_on", &vbr_on); - bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_type", &vbr_type); - bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_min_val", &vbr_min_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_max_val", &vbr_max_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "enforce_min_val", + ConfigDb *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); + aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_max_val", &vbr_max_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "enforce_min_val", &enforce_min_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "vbr_quality_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_quality_val", &vbr_quality_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "abr_val", &abr_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "toggle_xing_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "abr_val", &abr_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "toggle_xing_val", &toggle_xing_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "mark_original_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "mark_original_val", &mark_original_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "mark_copyright_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "mark_copyright_val", &mark_copyright_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "force_v2_val", &force_v2_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "only_v1_val", &only_v1_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "only_v2_val", &only_v2_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "algo_quality_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "force_v2_val", &force_v2_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "only_v1_val", &only_v1_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "only_v2_val", &only_v2_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "algo_quality_val", &algo_quality_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "out_samplerate_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "out_samplerate_val", &out_samplerate_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "bitrate_val", &bitrate_val); - bmp_cfg_db_get_float(db, "filewriter_mp3", "compression_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "bitrate_val", &bitrate_val); + aud_cfg_db_get_float(db, "filewriter_mp3", "compression_val", &compression_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "enc_toggle_val", &enc_toggle_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "audio_mode_val", &audio_mode_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "auto_ms_val", &auto_ms_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "enforce_iso_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "enc_toggle_val", &enc_toggle_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "audio_mode_val", &audio_mode_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "auto_ms_val", &auto_ms_val); + aud_cfg_db_get_int(db, "filewriter_mp3", "enforce_iso_val", &enforce_iso_val); - bmp_cfg_db_get_int(db, "filewriter_mp3", "error_protect_val", + aud_cfg_db_get_int(db, "filewriter_mp3", "error_protect_val", &error_protect_val); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static gint mp3_open(void) @@ -619,37 +619,37 @@ if (vbr_min_val > vbr_max_val) vbr_max_val = vbr_min_val; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_on", vbr_on); - bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_type", vbr_type); - bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_min_val", vbr_min_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_max_val", vbr_max_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "enforce_min_val", enforce_min_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "vbr_quality_val", vbr_quality_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "abr_val", abr_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "toggle_xing_val", toggle_xing_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "mark_original_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_on", vbr_on); + aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_type", vbr_type); + aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_min_val", vbr_min_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_max_val", vbr_max_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "enforce_min_val", enforce_min_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_quality_val", vbr_quality_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "abr_val", abr_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "toggle_xing_val", toggle_xing_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "mark_original_val", mark_original_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "mark_copyright_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "mark_copyright_val", mark_copyright_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "force_v2_val", force_v2_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "only_v1_val", only_v1_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "only_v2_val", only_v2_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "algo_quality_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "force_v2_val", force_v2_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "only_v1_val", only_v1_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "only_v2_val", only_v2_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "algo_quality_val", algo_quality_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "out_samplerate_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "out_samplerate_val", out_samplerate_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "bitrate_val", bitrate_val); - bmp_cfg_db_set_float(db, "filewriter_mp3", "compression_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "bitrate_val", bitrate_val); + aud_cfg_db_set_float(db, "filewriter_mp3", "compression_val", compression_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "enc_toggle_val", enc_toggle_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "audio_mode_val", audio_mode_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "auto_ms_val", auto_ms_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "enforce_iso_val", enforce_iso_val); - bmp_cfg_db_set_int(db, "filewriter_mp3", "error_protect_val", + aud_cfg_db_set_int(db, "filewriter_mp3", "enc_toggle_val", enc_toggle_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "audio_mode_val", audio_mode_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "auto_ms_val", auto_ms_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "enforce_iso_val", enforce_iso_val); + aud_cfg_db_set_int(db, "filewriter_mp3", "error_protect_val", error_protect_val); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_widget_destroy(configure_win); diff -r c349bd73af71 -r b8da6a0b0da2 src/filewriter/vorbis.c --- a/src/filewriter/vorbis.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/filewriter/vorbis.c Wed Oct 24 07:34:02 2007 +0300 @@ -63,11 +63,11 @@ static void vorbis_init(void) { - ConfigDb *db = bmp_cfg_db_open(); + ConfigDb *db = aud_cfg_db_open(); - bmp_cfg_db_get_float(db, "filewriter_vorbis", "base_quality", &v_base_quality); + aud_cfg_db_get_float(db, "filewriter_vorbis", "base_quality", &v_base_quality); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static gint vorbis_open(void) @@ -245,11 +245,11 @@ static void configure_ok_cb(gpointer data) { - ConfigDb *db = bmp_cfg_db_open(); + ConfigDb *db = aud_cfg_db_open(); - bmp_cfg_db_set_float(db, "filewrite_vorbis", "base_quality", v_base_quality); + aud_cfg_db_set_float(db, "filewrite_vorbis", "base_quality", v_base_quality); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_widget_hide(configure_win); } diff -r c349bd73af71 -r b8da6a0b0da2 src/hotkey/plugin.c --- a/src/hotkey/plugin.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/hotkey/plugin.c Wed Oct 24 07:34:02 2007 +0300 @@ -447,34 +447,34 @@ plugin_cfg.toggle_win_mask = 0; /* open configuration database */ - cfdb = bmp_cfg_db_open ( ); + cfdb = aud_cfg_db_open ( ); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "mute", &plugin_cfg.mute); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "mute_mask", &plugin_cfg.mute_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_down", &plugin_cfg.vol_down); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_down_mask", &plugin_cfg.vol_down_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_up", &plugin_cfg.vol_up); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "vol_up_mask", &plugin_cfg.vol_up_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "play", &plugin_cfg.play); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "play_mask", &plugin_cfg.play_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "pause", &plugin_cfg.pause); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "pause_mask", &plugin_cfg.pause_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "stop", &plugin_cfg.stop); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "stop_mask", &plugin_cfg.stop_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "prev_track", &plugin_cfg.prev_track); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "prev_track_mask", &plugin_cfg.prev_track_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "next_track", &plugin_cfg.next_track); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "next_track_mask", &plugin_cfg.next_track_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file", &plugin_cfg.jump_to_file); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file_mask", &plugin_cfg.jump_to_file_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "forward", &plugin_cfg.forward); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "forward_mask", &plugin_cfg.forward_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "backward", &plugin_cfg.backward); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "backward_mask", &plugin_cfg.backward_mask); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win", &plugin_cfg.toggle_win); - bmp_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win_mask", &plugin_cfg.toggle_win_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "mute", &plugin_cfg.mute); + aud_cfg_db_get_int (cfdb, "globalHotkey", "mute_mask", &plugin_cfg.mute_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_down", &plugin_cfg.vol_down); + aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_down_mask", &plugin_cfg.vol_down_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_up", &plugin_cfg.vol_up); + aud_cfg_db_get_int (cfdb, "globalHotkey", "vol_up_mask", &plugin_cfg.vol_up_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "play", &plugin_cfg.play); + aud_cfg_db_get_int (cfdb, "globalHotkey", "play_mask", &plugin_cfg.play_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "pause", &plugin_cfg.pause); + aud_cfg_db_get_int (cfdb, "globalHotkey", "pause_mask", &plugin_cfg.pause_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "stop", &plugin_cfg.stop); + aud_cfg_db_get_int (cfdb, "globalHotkey", "stop_mask", &plugin_cfg.stop_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "prev_track", &plugin_cfg.prev_track); + aud_cfg_db_get_int (cfdb, "globalHotkey", "prev_track_mask", &plugin_cfg.prev_track_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "next_track", &plugin_cfg.next_track); + aud_cfg_db_get_int (cfdb, "globalHotkey", "next_track_mask", &plugin_cfg.next_track_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file", &plugin_cfg.jump_to_file); + aud_cfg_db_get_int (cfdb, "globalHotkey", "jump_to_file_mask", &plugin_cfg.jump_to_file_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "forward", &plugin_cfg.forward); + aud_cfg_db_get_int (cfdb, "globalHotkey", "forward_mask", &plugin_cfg.forward_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "backward", &plugin_cfg.backward); + aud_cfg_db_get_int (cfdb, "globalHotkey", "backward_mask", &plugin_cfg.backward_mask); + aud_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win", &plugin_cfg.toggle_win); + aud_cfg_db_get_int (cfdb, "globalHotkey", "toggle_win_mask", &plugin_cfg.toggle_win_mask); - bmp_cfg_db_close (cfdb); + aud_cfg_db_close (cfdb); } /* save plugin configuration */ @@ -483,33 +483,33 @@ ConfigDb *cfdb; /* open configuration database */ - cfdb = bmp_cfg_db_open ( ); + cfdb = aud_cfg_db_open ( ); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "mute", plugin_cfg.mute); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "mute_mask", plugin_cfg.mute_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_up", plugin_cfg.vol_up); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_up_mask", plugin_cfg.vol_up_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_down", plugin_cfg.vol_down); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "vol_down_mask", plugin_cfg.vol_down_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "play", plugin_cfg.play); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "play_mask", plugin_cfg.play_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "pause", plugin_cfg.pause); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "pause_mask", plugin_cfg.pause_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "stop", plugin_cfg.stop); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "stop_mask", plugin_cfg.stop_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "prev_track", plugin_cfg.prev_track); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "prev_track_mask", plugin_cfg.prev_track_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "next_track", plugin_cfg.next_track); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "next_track_mask", plugin_cfg.next_track_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file", plugin_cfg.jump_to_file); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file_mask", plugin_cfg.jump_to_file_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "forward", plugin_cfg.forward); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "forward_mask", plugin_cfg.forward_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "backward", plugin_cfg.backward); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "backward_mask", plugin_cfg.backward_mask); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win", plugin_cfg.toggle_win); - bmp_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win_mask", plugin_cfg.toggle_win_mask); - bmp_cfg_db_close (cfdb); + aud_cfg_db_set_int (cfdb, "globalHotkey", "mute", plugin_cfg.mute); + aud_cfg_db_set_int (cfdb, "globalHotkey", "mute_mask", plugin_cfg.mute_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_up", plugin_cfg.vol_up); + aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_up_mask", plugin_cfg.vol_up_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_down", plugin_cfg.vol_down); + aud_cfg_db_set_int (cfdb, "globalHotkey", "vol_down_mask", plugin_cfg.vol_down_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "play", plugin_cfg.play); + aud_cfg_db_set_int (cfdb, "globalHotkey", "play_mask", plugin_cfg.play_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "pause", plugin_cfg.pause); + aud_cfg_db_set_int (cfdb, "globalHotkey", "pause_mask", plugin_cfg.pause_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "stop", plugin_cfg.stop); + aud_cfg_db_set_int (cfdb, "globalHotkey", "stop_mask", plugin_cfg.stop_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "prev_track", plugin_cfg.prev_track); + aud_cfg_db_set_int (cfdb, "globalHotkey", "prev_track_mask", plugin_cfg.prev_track_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "next_track", plugin_cfg.next_track); + aud_cfg_db_set_int (cfdb, "globalHotkey", "next_track_mask", plugin_cfg.next_track_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file", plugin_cfg.jump_to_file); + aud_cfg_db_set_int (cfdb, "globalHotkey", "jump_to_file_mask", plugin_cfg.jump_to_file_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "forward", plugin_cfg.forward); + aud_cfg_db_set_int (cfdb, "globalHotkey", "forward_mask", plugin_cfg.forward_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "backward", plugin_cfg.backward); + aud_cfg_db_set_int (cfdb, "globalHotkey", "backward_mask", plugin_cfg.backward_mask); + aud_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win", plugin_cfg.toggle_win); + aud_cfg_db_set_int (cfdb, "globalHotkey", "toggle_win_mask", plugin_cfg.toggle_win_mask); + aud_cfg_db_close (cfdb); } static int x11_error_handler (Display *dpy, XErrorEvent *error) diff -r c349bd73af71 -r b8da6a0b0da2 src/jack/configure.c --- a/src/jack/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/jack/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -53,11 +53,11 @@ jack_set_port_connection_mode(); /* update the connection mode */ - cfgfile = bmp_cfg_db_open(); + cfgfile = aud_cfg_db_open(); - bmp_cfg_db_set_bool(cfgfile, "jack", "isTraceEnabled", jack_cfg.isTraceEnabled); - bmp_cfg_db_set_string(cfgfile, "jack", "port_connection_mode", jack_cfg.port_connection_mode); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_set_bool(cfgfile, "jack", "isTraceEnabled", jack_cfg.isTraceEnabled); + aud_cfg_db_set_string(cfgfile, "jack", "port_connection_mode", jack_cfg.port_connection_mode); + aud_cfg_db_close(cfgfile); gtk_widget_destroy(configure_win); } diff -r c349bd73af71 -r b8da6a0b0da2 src/jack/jack.c --- a/src/jack/jack.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/jack/jack.c Wed Oct 24 07:34:02 2007 +0300 @@ -196,7 +196,7 @@ /* read the isTraceEnabled setting from the config file */ ConfigDb *cfgfile; - cfgfile = bmp_cfg_db_open(); + cfgfile = aud_cfg_db_open(); if (!cfgfile) { jack_cfg.isTraceEnabled = FALSE; @@ -205,16 +205,16 @@ jack_cfg.volume_right = 25; } else { - bmp_cfg_db_get_bool(cfgfile, "jack", "isTraceEnabled", &jack_cfg.isTraceEnabled); - if(!bmp_cfg_db_get_string(cfgfile, "jack", "port_connection_mode", &jack_cfg.port_connection_mode)) + aud_cfg_db_get_bool(cfgfile, "jack", "isTraceEnabled", &jack_cfg.isTraceEnabled); + if(!aud_cfg_db_get_string(cfgfile, "jack", "port_connection_mode", &jack_cfg.port_connection_mode)) jack_cfg.port_connection_mode = "CONNECT_ALL"; - if(!bmp_cfg_db_get_int(cfgfile, "jack", "volume_left", &jack_cfg.volume_left)) + if(!aud_cfg_db_get_int(cfgfile, "jack", "volume_left", &jack_cfg.volume_left)) jack_cfg.volume_left = 25; - if(!bmp_cfg_db_get_int(cfgfile, "jack", "volume_right", &jack_cfg.volume_right)) + if(!aud_cfg_db_get_int(cfgfile, "jack", "volume_right", &jack_cfg.volume_right)) jack_cfg.volume_right = 25; } - bmp_cfg_db_close(cfgfile); + aud_cfg_db_close(cfgfile); TRACE("initializing\n"); @@ -274,10 +274,10 @@ { ConfigDb *cfgfile; - cfgfile = bmp_cfg_db_open(); - bmp_cfg_db_set_int(cfgfile, "jack", "volume_left", jack_cfg.volume_left); /* stores the volume setting */ - bmp_cfg_db_set_int(cfgfile, "jack", "volume_right", jack_cfg.volume_right); - bmp_cfg_db_close(cfgfile); + cfgfile = aud_cfg_db_open(); + aud_cfg_db_set_int(cfgfile, "jack", "volume_left", jack_cfg.volume_left); /* stores the volume setting */ + aud_cfg_db_set_int(cfgfile, "jack", "volume_right", jack_cfg.volume_right); + aud_cfg_db_close(cfgfile); TRACE("\n"); diff -r c349bd73af71 -r b8da6a0b0da2 src/ladspa/ladspa.c --- a/src/ladspa/ladspa.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/ladspa/ladspa.c Wed Oct 24 07:34:02 2007 +0300 @@ -144,29 +144,29 @@ ConfigDb *db; gint k, plugins= 0; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_get_int(db, "ladspa", "plugins", &plugins); + aud_cfg_db_get_int(db, "ladspa", "plugins", &plugins); for (k= 0; k < plugins; ++k) { gint id; int port, ports= 0; plugin_instance *instance; gchar *section = g_strdup_printf("ladspa_plugin%d", k); - bmp_cfg_db_get_int(db, section, "id", &id); + aud_cfg_db_get_int(db, section, "id", &id); instance = add_plugin(get_plugin_by_id(id)); if (!instance) continue; /* couldn't load this plugin */ - bmp_cfg_db_get_int(db, section, "ports", &ports); + aud_cfg_db_get_int(db, section, "ports", &ports); for (port= 0; port < ports && port < MAX_KNOBS; ++port) { gchar *key = g_strdup_printf("port%d", port); - bmp_cfg_db_get_float(db, section, key, &(instance->knobs[port])); + aud_cfg_db_get_float(db, section, key, &(instance->knobs[port])); } instance->restored = TRUE; g_free(section); } state.initialised = TRUE; - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static ladspa_plugin *get_plugin_by_id(long id) @@ -261,33 +261,33 @@ return; } state.running = FALSE; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); G_LOCK (running_plugins); for (list= running_plugins; list != NULL; list = g_slist_next(list)) { plugin_instance *instance = (plugin_instance *) list->data; gchar *section = g_strdup_printf("ladspa_plugin%d", plugins++); int port, ports= 0; - bmp_cfg_db_set_int(db, section, "id", instance->descriptor->UniqueID); - bmp_cfg_db_set_string(db, section, "file", instance->filename); - bmp_cfg_db_set_string(db, section, "label", (gchar *) + aud_cfg_db_set_int(db, section, "id", instance->descriptor->UniqueID); + aud_cfg_db_set_string(db, section, "file", instance->filename); + aud_cfg_db_set_string(db, section, "label", (gchar *) instance->descriptor->Label); ports = instance->descriptor->PortCount; if (ports > MAX_KNOBS) ports = MAX_KNOBS; for (port= 0; port < ports; ++port) { gchar *key = g_strdup_printf("port%d", port); - bmp_cfg_db_set_float(db, section, key, instance->knobs[port]); + aud_cfg_db_set_float(db, section, key, instance->knobs[port]); g_free(key); } - bmp_cfg_db_set_int(db, section, "ports", ports); + aud_cfg_db_set_int(db, section, "ports", ports); g_free(section); ladspa_shutdown (instance); } G_UNLOCK (running_plugins); - bmp_cfg_db_set_int(db, "ladspa", "plugins", plugins); - bmp_cfg_db_close(db); + aud_cfg_db_set_int(db, "ladspa", "plugins", plugins); + aud_cfg_db_close(db); } static void ladspa_shutdown (plugin_instance *instance) diff -r c349bd73af71 -r b8da6a0b0da2 src/lastfm/lastfm.c --- a/src/lastfm/lastfm.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/lastfm/lastfm.c Wed Oct 24 07:34:02 2007 +0300 @@ -112,11 +112,11 @@ gchar *buf=NULL, *username = NULL, *password = NULL; - if ((cfg = bmp_cfg_db_open()) != NULL) + if ((cfg = aud_cfg_db_open()) != NULL) { - bmp_cfg_db_get_string(cfg, "audioscrobbler","username", + aud_cfg_db_get_string(cfg, "audioscrobbler","username", &username); - bmp_cfg_db_get_string(cfg, "audioscrobbler","password", + aud_cfg_db_get_string(cfg, "audioscrobbler","password", &password); g_free(cfg); } diff -r c349bd73af71 -r b8da6a0b0da2 src/madplug/configure.c --- a/src/madplug/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/madplug/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -77,35 +77,35 @@ audmad_config_compute(&audmad_config); - db = bmp_cfg_db_open(); - bmp_cfg_db_set_int(db, "MAD", "http_buffer_size", + db = aud_cfg_db_open(); + aud_cfg_db_set_int(db, "MAD", "http_buffer_size", audmad_config.http_buffer_size); - bmp_cfg_db_set_bool(db, "MAD", "fast_play_time_calc", + aud_cfg_db_set_bool(db, "MAD", "fast_play_time_calc", audmad_config.fast_play_time_calc); - bmp_cfg_db_set_bool(db, "MAD", "use_xing", audmad_config.use_xing); - bmp_cfg_db_set_bool(db, "MAD", "dither", audmad_config.dither); - bmp_cfg_db_set_bool(db, "MAD", "sjis", audmad_config.sjis); - bmp_cfg_db_set_bool(db, "MAD", "hard_limit", + aud_cfg_db_set_bool(db, "MAD", "use_xing", audmad_config.use_xing); + aud_cfg_db_set_bool(db, "MAD", "dither", audmad_config.dither); + aud_cfg_db_set_bool(db, "MAD", "sjis", audmad_config.sjis); + aud_cfg_db_set_bool(db, "MAD", "hard_limit", audmad_config.hard_limit); - bmp_cfg_db_set_string(db, "MAD", "pregain_db", + aud_cfg_db_set_string(db, "MAD", "pregain_db", audmad_config.pregain_db); - bmp_cfg_db_set_bool(db, "MAD", "RG.enable", + aud_cfg_db_set_bool(db, "MAD", "RG.enable", audmad_config.replaygain.enable); - bmp_cfg_db_set_bool(db, "MAD", "RG.track_mode", + aud_cfg_db_set_bool(db, "MAD", "RG.track_mode", audmad_config.replaygain.track_mode); - bmp_cfg_db_set_string(db, "MAD", "RG.default_db", + aud_cfg_db_set_string(db, "MAD", "RG.default_db", audmad_config.replaygain.default_db); - bmp_cfg_db_set_bool(db, "MAD", "title_override", audmad_config.title_override); - bmp_cfg_db_set_string(db, "MAD", "id3_format", audmad_config.id3_format); + aud_cfg_db_set_bool(db, "MAD", "title_override", audmad_config.title_override); + aud_cfg_db_set_string(db, "MAD", "id3_format", audmad_config.id3_format); - bmp_cfg_db_set_bool(db, "MAD", "show_avg_vbr_bitrate", + aud_cfg_db_set_bool(db, "MAD", "show_avg_vbr_bitrate", audmad_config.show_avg_vbr_bitrate); - bmp_cfg_db_set_bool(db, "MAD", "force_reopen_audio", + aud_cfg_db_set_bool(db, "MAD", "force_reopen_audio", audmad_config.force_reopen_audio); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_widget_destroy(configure_win); } diff -r c349bd73af71 -r b8da6a0b0da2 src/madplug/plugin.c --- a/src/madplug/plugin.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/madplug/plugin.c Wed Oct 24 07:34:02 2007 +0300 @@ -131,34 +131,34 @@ audmad_config.show_avg_vbr_bitrate = TRUE; audmad_config.force_reopen_audio = FALSE; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); if (db) { - bmp_cfg_db_get_bool(db, "MAD", "fast_play_time_calc", + aud_cfg_db_get_bool(db, "MAD", "fast_play_time_calc", &audmad_config.fast_play_time_calc); - bmp_cfg_db_get_bool(db, "MAD", "use_xing", + aud_cfg_db_get_bool(db, "MAD", "use_xing", &audmad_config.use_xing); - bmp_cfg_db_get_bool(db, "MAD", "dither", &audmad_config.dither); - bmp_cfg_db_get_bool(db, "MAD", "sjis", &audmad_config.sjis); - bmp_cfg_db_get_bool(db, "MAD", "hard_limit", + aud_cfg_db_get_bool(db, "MAD", "dither", &audmad_config.dither); + aud_cfg_db_get_bool(db, "MAD", "sjis", &audmad_config.sjis); + aud_cfg_db_get_bool(db, "MAD", "hard_limit", &audmad_config.hard_limit); - bmp_cfg_db_get_string(db, "MAD", "pregain_db", + aud_cfg_db_get_string(db, "MAD", "pregain_db", &audmad_config.pregain_db); - bmp_cfg_db_get_bool(db, "MAD", "RG.enable", + aud_cfg_db_get_bool(db, "MAD", "RG.enable", &audmad_config.replaygain.enable); - bmp_cfg_db_get_bool(db, "MAD", "RG.track_mode", + aud_cfg_db_get_bool(db, "MAD", "RG.track_mode", &audmad_config.replaygain.track_mode); - bmp_cfg_db_get_string(db, "MAD", "RG.default_db", + aud_cfg_db_get_string(db, "MAD", "RG.default_db", &audmad_config.replaygain.default_db); - bmp_cfg_db_get_bool(db, "MAD", "title_override", + aud_cfg_db_get_bool(db, "MAD", "title_override", &audmad_config.title_override); - bmp_cfg_db_get_string(db, "MAD", "id3_format", + aud_cfg_db_get_string(db, "MAD", "id3_format", &audmad_config.id3_format); - bmp_cfg_db_get_bool(db, "MAD", "show_avg_vbr_bitrate", + aud_cfg_db_get_bool(db, "MAD", "show_avg_vbr_bitrate", &audmad_config.show_avg_vbr_bitrate); - bmp_cfg_db_get_bool(db, "MAD", "force_reopen_audio", + aud_cfg_db_get_bool(db, "MAD", "force_reopen_audio", &audmad_config.force_reopen_audio); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } mad_mutex = g_mutex_new(); diff -r c349bd73af71 -r b8da6a0b0da2 src/neon/neon.c --- a/src/neon/neon.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/neon/neon.c Wed Oct 24 07:34:02 2007 +0300 @@ -555,17 +555,17 @@ _ENTER; - db = bmp_cfg_db_open(); - if (FALSE == bmp_cfg_db_get_bool(db, NULL, "use_proxy", &use_proxy)) { + db = aud_cfg_db_open(); + if (FALSE == aud_cfg_db_get_bool(db, NULL, "use_proxy", &use_proxy)) { use_proxy = FALSE; } if (use_proxy) { - if (FALSE == bmp_cfg_db_get_string(db, NULL, "proxy_host", &proxy_host)) { + if (FALSE == aud_cfg_db_get_string(db, NULL, "proxy_host", &proxy_host)) { _ERROR("Could not read proxy host, disabling proxy use"); use_proxy = FALSE; } - if (FALSE == bmp_cfg_db_get_string(db, NULL, "proxy_port", &proxy_port_s)) { + if (FALSE == aud_cfg_db_get_string(db, NULL, "proxy_port", &proxy_port_s)) { _ERROR("Could not read proxy port, disabling proxy use"); use_proxy = FALSE; } @@ -578,7 +578,7 @@ use_proxy = FALSE; } } - bmp_cfg_db_close(db); + aud_cfg_db_close(db); handle->redircount = 0; diff -r c349bd73af71 -r b8da6a0b0da2 src/null/null.c --- a/src/null/null.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/null/null.c Wed Oct 24 07:34:02 2007 +0300 @@ -45,9 +45,9 @@ static void null_init(void) { ConfigDb *db; - db = bmp_cfg_db_open(); - bmp_cfg_db_get_bool(db, "null", "real_time", &real_time); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_get_bool(db, "null", "real_time", &real_time); + aud_cfg_db_close(db); } static void null_about(void) @@ -75,10 +75,10 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); real_time = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data)); - bmp_cfg_db_set_bool(db, "null", "real_time", real_time); - bmp_cfg_db_close(db); + aud_cfg_db_set_bool(db, "null", "real_time", real_time); + aud_cfg_db_close(db); gtk_widget_destroy(configurewin); } diff -r c349bd73af71 -r b8da6a0b0da2 src/paranormal-ng/cfg.c --- a/src/paranormal-ng/cfg.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/paranormal-ng/cfg.c Wed Oct 24 07:34:02 2007 +0300 @@ -370,11 +370,11 @@ GtkCTreeNode *root; ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); fname = (char *) gtk_file_selection_get_filename (selector); a = load_preset (fname); - bmp_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname); - bmp_cfg_db_close(db); + aud_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname); + aud_cfg_db_close(db); if (! a) pn_error ("Unable to load file: \"%s\"", fname); else @@ -395,12 +395,12 @@ ConfigDb *db; gchar *last_path; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); selector = gtk_file_selection_new ("Load Preset"); - if(bmp_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) { + if(aud_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) { gtk_file_selection_set_filename(GTK_FILE_SELECTION(selector), last_path); } - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button), "clicked", GTK_SIGNAL_FUNC (load_sel_cb), selector); diff -r c349bd73af71 -r b8da6a0b0da2 src/paranormal/cfg.c --- a/src/paranormal/cfg.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/paranormal/cfg.c Wed Oct 24 07:34:02 2007 +0300 @@ -370,11 +370,11 @@ GtkCTreeNode *root; ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); fname = (char *) gtk_file_selection_get_filename (selector); a = load_preset (fname); - bmp_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname); - bmp_cfg_db_close(db); + aud_cfg_db_set_string(db, "paranormal", "last_path", (char*)fname); + aud_cfg_db_close(db); if (! a) pn_error ("Unable to load file: \"%s\"", fname); else @@ -395,12 +395,12 @@ ConfigDb *db; gchar *last_path; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); selector = gtk_file_selection_new ("Load Preset"); - if(bmp_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) { + if(aud_cfg_db_get_string(db, "paranormal", "last_path", &last_path)) { gtk_file_selection_set_filename(GTK_FILE_SELECTION(selector), last_path); } - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (selector)->ok_button), "clicked", GTK_SIGNAL_FUNC (load_sel_cb), selector); diff -r c349bd73af71 -r b8da6a0b0da2 src/rootvis/config_backend.c --- a/src/rootvis/config_backend.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/rootvis/config_backend.c Wed Oct 24 07:34:02 2007 +0300 @@ -43,18 +43,18 @@ { case BOOLN: case INT: - bmp_cfg_db_set_int(fp, sect, val.name, *val.vali.var); + aud_cfg_db_set_int(fp, sect, val.name, *val.vali.var); break; case FLOAT: - bmp_cfg_db_set_float(fp, sect, val.name, *val.valf.var); + aud_cfg_db_set_float(fp, sect, val.name, *val.valf.var); break; case TEXT: - bmp_cfg_db_set_string(fp, sect, val.name, *val.valt.var); + aud_cfg_db_set_string(fp, sect, val.name, *val.valt.var); break; case COLOR: { char colortmp[10]; - bmp_cfg_db_set_string(fp, sect, val.name, color_arr2quad(val.valc.var, colortmp)); + aud_cfg_db_set_string(fp, sect, val.name, color_arr2quad(val.valc.var, colortmp)); } break; } @@ -66,21 +66,21 @@ { case BOOLN: case INT: - if (!(bmp_cfg_db_get_int(fp, sect, val.name, val.vali.var))) + if (!(aud_cfg_db_get_int(fp, sect, val.name, val.vali.var))) cval_writefile(val, fp, sect); break; case FLOAT: - if (!(bmp_cfg_db_get_float(fp, sect, val.name, val.valf.var))) + if (!(aud_cfg_db_get_float(fp, sect, val.name, val.valf.var))) cval_writefile(val, fp, sect); break; case TEXT: - if (!(bmp_cfg_db_get_string(fp, sect, val.name, val.valt.var))) + if (!(aud_cfg_db_get_string(fp, sect, val.name, val.valt.var))) cval_writefile(val, fp, sect); break; case COLOR: { char* colortmp = NULL; - if (!(bmp_cfg_db_get_string(fp, sect, val.name, &colortmp))) + if (!(aud_cfg_db_get_string(fp, sect, val.name, &colortmp))) cval_writefile(val, fp, sect); else color_quad2arr(val.valc.var, colortmp); } @@ -95,7 +95,7 @@ int i, j; ConfigDb *fp; - fp = bmp_cfg_db_open(); + fp = aud_cfg_db_open(); print_status("Reading configuration"); @@ -114,7 +114,7 @@ cval_readfile(Cchannel[j].def[i], fp, (j == 0 ? "rootvis" : "rootvis2")); } - bmp_cfg_db_close(fp); + aud_cfg_db_close(fp); print_status("Configuration finished"); } @@ -123,7 +123,7 @@ ConfigDb *fp; print_status("Writing configuration"); - fp = bmp_cfg_db_open(); + fp = aud_cfg_db_open(); if (number == 2) for (i = 0; i < Cmain.count; ++i) @@ -134,7 +134,7 @@ for (i = 0; i < Cchannel[j].count; ++i) cval_writefile(Cchannel[j].def[i], fp, (j == 0 ? "rootvis" : "rootvis2")); - bmp_cfg_db_close(fp); + aud_cfg_db_close(fp); } void config_revert(int number) { diff -r c349bd73af71 -r b8da6a0b0da2 src/scrobbler/configure.c --- a/src/scrobbler/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/scrobbler/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -50,20 +50,20 @@ const char *ge_uid = gtk_entry_get_text(GTK_ENTRY(ge_entry1)); const char *ge_pwd = gtk_entry_get_text(GTK_ENTRY(ge_entry2)); - if ((cfgfile = bmp_cfg_db_open())) + if ((cfgfile = aud_cfg_db_open())) { md5_state_t md5state; unsigned char md5pword[16], ge_md5pword[16]; - bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "username", (char *)uid); - bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_username", (char *)ge_uid); + aud_cfg_db_set_string(cfgfile, "audioscrobbler", "username", (char *)uid); + aud_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_username", (char *)ge_uid); if (pwd != NULL && pwd[0] != '\0' && strlen(pwd)) { md5_init(&md5state); md5_append(&md5state, (unsigned const char *)pwd, strlen(pwd)); md5_finish(&md5state, md5pword); - bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "password", + aud_cfg_db_set_string(cfgfile, "audioscrobbler", "password", hexify((char*)md5pword, sizeof(md5pword))); } @@ -72,11 +72,11 @@ md5_init(&md5state); md5_append(&md5state, (unsigned const char *)ge_pwd, strlen(ge_pwd)); md5_finish(&md5state, ge_md5pword); - bmp_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_password", + aud_cfg_db_set_string(cfgfile, "audioscrobbler", "ge_password", hexify((char*)ge_md5pword, sizeof(ge_md5pword))); } - bmp_cfg_db_close(cfgfile); + aud_cfg_db_close(cfgfile); } } @@ -197,10 +197,10 @@ gtk_entry_set_text(GTK_ENTRY(entry1), ""); gtk_entry_set_text(GTK_ENTRY(entry2), ""); - if ((db = bmp_cfg_db_open())) { + if ((db = aud_cfg_db_open())) { gchar *username = NULL; // last fm - bmp_cfg_db_get_string(db, "audioscrobbler", "username", + aud_cfg_db_get_string(db, "audioscrobbler", "username", &username); if (username) { gtk_entry_set_text(GTK_ENTRY(entry1), username); @@ -208,7 +208,7 @@ username = NULL; } // gerpok - bmp_cfg_db_get_string(db, "audioscrobbler", "ge_username", + aud_cfg_db_get_string(db, "audioscrobbler", "ge_username", &username); if (username) { gtk_entry_set_text(GTK_ENTRY(ge_entry1), username); @@ -216,7 +216,7 @@ username = NULL; } - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } return vbox2; diff -r c349bd73af71 -r b8da6a0b0da2 src/scrobbler/plugin.c --- a/src/scrobbler/plugin.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/scrobbler/plugin.c Wed Oct 24 07:34:02 2007 +0300 @@ -103,16 +103,16 @@ aud_prefswin_page_new(cfgdlg, "Scrobbler", DATA_DIR "/images/audioscrobbler.png"); - if ((cfgfile = bmp_cfg_db_open()) != NULL) { - bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "username", + if ((cfgfile = aud_cfg_db_open()) != NULL) { + aud_cfg_db_get_string(cfgfile, "audioscrobbler", "username", &username); - bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "password", + aud_cfg_db_get_string(cfgfile, "audioscrobbler", "password", &password); - bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_username", + aud_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_username", &ge_username); - bmp_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_password", + aud_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_password", &ge_password); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_close(cfgfile); } if ((!username || !password) || (!*username || !*password)) diff -r c349bd73af71 -r b8da6a0b0da2 src/shnplug/gtk.c --- a/src/shnplug/gtk.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/shnplug/gtk.c Wed Oct 24 07:34:02 2007 +0300 @@ -125,16 +125,16 @@ shn_cfg.textfile_extensions = g_strdup(gtk_entry_get_text(GTK_ENTRY(textfile_extensions_entry))); filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL); - cfg = bmp_cfg_db_open(); - bmp_cfg_db_set_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, shn_cfg.error_output_method); - bmp_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, shn_cfg.verbose); - bmp_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, shn_cfg.seek_tables_path); - bmp_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, shn_cfg.relative_seek_tables_path); - bmp_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, shn_cfg.swap_bytes); - bmp_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, shn_cfg.load_textfiles); - bmp_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, shn_cfg.textfile_extensions); + cfg = aud_cfg_db_open(); + aud_cfg_db_set_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, shn_cfg.error_output_method); + aud_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, shn_cfg.verbose); + aud_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, shn_cfg.seek_tables_path); + aud_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, shn_cfg.relative_seek_tables_path); + aud_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, shn_cfg.swap_bytes); + aud_cfg_db_set_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, shn_cfg.load_textfiles); + aud_cfg_db_set_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, shn_cfg.textfile_extensions); - bmp_cfg_db_close(cfg); + aud_cfg_db_close(cfg); g_free(filename); } diff -r c349bd73af71 -r b8da6a0b0da2 src/shnplug/shn.c --- a/src/shnplug/shn.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/shnplug/shn.c Wed Oct 24 07:34:02 2007 +0300 @@ -107,19 +107,19 @@ shn_cfg.textfile_extensions = NULL; shn_cfg.textfile_extensions_config_name = "textfile_extensions"; - if ((cfg = bmp_cfg_db_open()) != 0) + if ((cfg = aud_cfg_db_open()) != 0) { - bmp_cfg_db_get_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, &shn_cfg.error_output_method); - bmp_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, &shn_cfg.verbose); - if (!bmp_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, &shn_cfg.seek_tables_path)) + aud_cfg_db_get_int(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.error_output_method_config_name, &shn_cfg.error_output_method); + aud_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.verbose_config_name, &shn_cfg.verbose); + if (!aud_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.seek_tables_path_config_name, &shn_cfg.seek_tables_path)) shn_cfg.seek_tables_path = g_strdup(g_get_home_dir()); - if (!bmp_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, &shn_cfg.relative_seek_tables_path)) + if (!aud_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.relative_seek_tables_path_config_name, &shn_cfg.relative_seek_tables_path)) shn_cfg.relative_seek_tables_path = g_strdup(""); - bmp_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, &shn_cfg.swap_bytes); - bmp_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, &shn_cfg.load_textfiles); - if (!bmp_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, &shn_cfg.textfile_extensions)) + aud_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.swap_bytes_config_name, &shn_cfg.swap_bytes); + aud_cfg_db_get_bool(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.load_textfiles_config_name, &shn_cfg.load_textfiles); + if (!aud_cfg_db_get_string(cfg, XMMS_SHN_VERSION_TAG, shn_cfg.textfile_extensions_config_name, &shn_cfg.textfile_extensions)) shn_cfg.textfile_extensions = g_strdup("txt,nfo"); - bmp_cfg_db_close(cfg); + aud_cfg_db_close(cfg); } } diff -r c349bd73af71 -r b8da6a0b0da2 src/sndstretch/sndstretch_xmms.c --- a/src/sndstretch/sndstretch_xmms.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/sndstretch/sndstretch_xmms.c Wed Oct 24 07:34:02 2007 +0300 @@ -257,15 +257,15 @@ static gint sndstretch_config_destroy_cb(GtkWidget * w, GdkEventAny * e, gpointer data) { - ConfigDb *db = bmp_cfg_db_open(); + ConfigDb *db = aud_cfg_db_open(); - bmp_cfg_db_set_double(db, "sndstretch", "pitch", SS.pitch); - bmp_cfg_db_set_double(db, "sndstretch", "speed", SS.speed); + aud_cfg_db_set_double(db, "sndstretch", "pitch", SS.pitch); + aud_cfg_db_set_double(db, "sndstretch", "speed", SS.speed); - bmp_cfg_db_set_bool(db, "sndstretch", "short_overlap", SS.short_overlap); - bmp_cfg_db_set_bool(db, "sndstretch", "volume_corr", SS.volume_corr); + aud_cfg_db_set_bool(db, "sndstretch", "short_overlap", SS.short_overlap); + aud_cfg_db_set_bool(db, "sndstretch", "volume_corr", SS.volume_corr); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); gtk_widget_destroy(sndstretch_config_dialog); sndstretch_config_dialog = NULL; @@ -405,7 +405,7 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); SS.fragsize=0; SS.chnr=2; @@ -423,13 +423,13 @@ SS.scale=1.0; gboolean b; - bmp_cfg_db_get_double(db, "sndstretch", "pitch", &SS.pitch); - bmp_cfg_db_get_double(db, "sndstretch", "speed", &SS.speed); - if (bmp_cfg_db_get_bool(db, "sndstretch", "short_overlap", &b)) + aud_cfg_db_get_double(db, "sndstretch", "pitch", &SS.pitch); + aud_cfg_db_get_double(db, "sndstretch", "speed", &SS.speed); + if (aud_cfg_db_get_bool(db, "sndstretch", "short_overlap", &b)) SS.short_overlap = b; - if (bmp_cfg_db_get_bool(db, "sndstretch", "volume_corr", &b)) + if (aud_cfg_db_get_bool(db, "sndstretch", "volume_corr", &b)) SS.volume_corr = b; - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } int sndstretch_mod_samples (gpointer *ptr, gint length, AFormat fmt, gint srate, gint nch) diff -r c349bd73af71 -r b8da6a0b0da2 src/song_change/song_change.c --- a/src/song_change/song_change.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/song_change/song_change.c Wed Oct 24 07:34:02 2007 +0300 @@ -169,16 +169,16 @@ { ConfigDb *db; - db = bmp_cfg_db_open(); - if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line", &cmd_line) ) + db = aud_cfg_db_open(); + if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line", &cmd_line) ) cmd_line = g_strdup(""); - if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line_after", &cmd_line_after) ) + if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_after", &cmd_line_after) ) cmd_line_after = g_strdup(""); - if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line_end", &cmd_line_end) ) + if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_end", &cmd_line_end) ) cmd_line_end = g_strdup(""); - if ( !bmp_cfg_db_get_string(db, "song_change", "cmd_line_ttc", &cmd_line_ttc) ) + if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_ttc", &cmd_line_ttc) ) cmd_line_ttc = g_strdup(""); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static void cleanup(void) @@ -219,12 +219,12 @@ cmd_end = g_strdup(gtk_entry_get_text(GTK_ENTRY(cmd_end_entry))); cmd_ttc = g_strdup(gtk_entry_get_text(GTK_ENTRY(cmd_ttc_entry))); - db = bmp_cfg_db_open(); - bmp_cfg_db_set_string(db, "song_change", "cmd_line", cmd); - bmp_cfg_db_set_string(db, "song_change", "cmd_line_after", cmd_after); - bmp_cfg_db_set_string(db, "song_change", "cmd_line_end", cmd_end); - bmp_cfg_db_set_string(db, "song_change", "cmd_line_ttc", cmd_ttc); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_string(db, "song_change", "cmd_line", cmd); + aud_cfg_db_set_string(db, "song_change", "cmd_line_after", cmd_after); + aud_cfg_db_set_string(db, "song_change", "cmd_line_end", cmd_end); + aud_cfg_db_set_string(db, "song_change", "cmd_line_ttc", cmd_ttc); + aud_cfg_db_close(db); if (cmd_line != NULL) g_free(cmd_line); diff -r c349bd73af71 -r b8da6a0b0da2 src/statusicon/si_cfg.c --- a/src/statusicon/si_cfg.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/statusicon/si_cfg.c Wed Oct 24 07:34:02 2007 +0300 @@ -29,27 +29,27 @@ void si_cfg_load ( void ) { - ConfigDb *cfgfile = bmp_cfg_db_open(); + ConfigDb *cfgfile = aud_cfg_db_open(); - if ( !bmp_cfg_db_get_int( cfgfile , "statusicon" , + if ( !aud_cfg_db_get_int( cfgfile , "statusicon" , "rclick_menu" , &(si_cfg.rclick_menu) ) ) si_cfg.rclick_menu = SI_CFG_RCLICK_MENU_AUD; - if ( !bmp_cfg_db_get_int( cfgfile , "statusicon" , + if ( !aud_cfg_db_get_int( cfgfile , "statusicon" , "scroll_action" , &(si_cfg.scroll_action) ) ) si_cfg.scroll_action = SI_CFG_SCROLL_ACTION_VOLUME; - if ( !bmp_cfg_db_get_bool( cfgfile , "statusicon" , + if ( !aud_cfg_db_get_bool( cfgfile , "statusicon" , "mw_visib_prevstatus" , &(si_cfg.mw_visib_prevstatus) ) ) si_cfg.mw_visib_prevstatus = FALSE; - if ( !bmp_cfg_db_get_bool( cfgfile , "statusicon" , + if ( !aud_cfg_db_get_bool( cfgfile , "statusicon" , "pw_visib_prevstatus" , &(si_cfg.pw_visib_prevstatus) ) ) si_cfg.pw_visib_prevstatus = FALSE; - if ( !bmp_cfg_db_get_bool( cfgfile , "statusicon" , + if ( !aud_cfg_db_get_bool( cfgfile , "statusicon" , "ew_visib_prevstatus" , &(si_cfg.ew_visib_prevstatus) ) ) si_cfg.ew_visib_prevstatus = FALSE; - bmp_cfg_db_close( cfgfile ); + aud_cfg_db_close( cfgfile ); return; } @@ -57,21 +57,21 @@ void si_cfg_save ( void ) { - ConfigDb *cfgfile = bmp_cfg_db_open(); + ConfigDb *cfgfile = aud_cfg_db_open(); - bmp_cfg_db_set_int( cfgfile , "statusicon" , + aud_cfg_db_set_int( cfgfile , "statusicon" , "rclick_menu" , si_cfg.rclick_menu ); - bmp_cfg_db_set_int( cfgfile , "statusicon" , + aud_cfg_db_set_int( cfgfile , "statusicon" , "scroll_action" , si_cfg.scroll_action ); - bmp_cfg_db_set_bool( cfgfile , "statusicon" , + aud_cfg_db_set_bool( cfgfile , "statusicon" , "mw_visib_prevstatus" , si_cfg.mw_visib_prevstatus ); - bmp_cfg_db_set_bool( cfgfile , "statusicon" , + aud_cfg_db_set_bool( cfgfile , "statusicon" , "pw_visib_prevstatus" , si_cfg.pw_visib_prevstatus ); - bmp_cfg_db_set_bool( cfgfile , "statusicon" , + aud_cfg_db_set_bool( cfgfile , "statusicon" , "ew_visib_prevstatus" , si_cfg.ew_visib_prevstatus ); - bmp_cfg_db_close( cfgfile ); + aud_cfg_db_close( cfgfile ); return; } diff -r c349bd73af71 -r b8da6a0b0da2 src/stereo_plugin/stereo.c --- a/src/stereo_plugin/stereo.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/stereo_plugin/stereo.c Wed Oct 24 07:34:02 2007 +0300 @@ -36,10 +36,10 @@ static void init(void) { ConfigDb *db; - db = bmp_cfg_db_open(); - if (!bmp_cfg_db_get_double(db, "extra_stereo", "intensity", &value)) + db = aud_cfg_db_open(); + if (!aud_cfg_db_get_double(db, "extra_stereo", "intensity", &value)) value = 2.5; - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } static void about(void) @@ -63,9 +63,9 @@ value = *(gdouble *) data; - db = bmp_cfg_db_open(); - bmp_cfg_db_set_double(db, "extra_stereo", "intensity", value); - bmp_cfg_db_close(db); + db = aud_cfg_db_open(); + aud_cfg_db_set_double(db, "extra_stereo", "intensity", value); + aud_cfg_db_close(db); gtk_widget_destroy(conf_dialog); } diff -r c349bd73af71 -r b8da6a0b0da2 src/sun/configure.c --- a/src/sun/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/sun/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -57,26 +57,26 @@ sun_mixer_close(); } - cfgfile = bmp_cfg_db_open(); + cfgfile = aud_cfg_db_open(); - bmp_cfg_db_set_string(cfgfile, "sun", + aud_cfg_db_set_string(cfgfile, "sun", "audio_devaudio", audio.devaudio); - bmp_cfg_db_set_string(cfgfile, "sun", + aud_cfg_db_set_string(cfgfile, "sun", "audio_devaudioctl", audio.devaudioctl); - bmp_cfg_db_set_string(cfgfile, "sun", + aud_cfg_db_set_string(cfgfile, "sun", "audio_devmixer", audio.devmixer); - bmp_cfg_db_set_string(cfgfile, "sun", + aud_cfg_db_set_string(cfgfile, "sun", "mixer_voldev", audio.mixer_voldev); - bmp_cfg_db_set_bool(cfgfile, "sun", + aud_cfg_db_set_bool(cfgfile, "sun", "mixer_keepopen", audio.mixer_keepopen); - bmp_cfg_db_set_int(cfgfile, "sun", + aud_cfg_db_set_int(cfgfile, "sun", "buffer_size", audio.req_buffer_size); - bmp_cfg_db_set_int(cfgfile, "sun", + aud_cfg_db_set_int(cfgfile, "sun", "prebuffer_size", audio.req_prebuffer_size); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_close(cfgfile); configure_win_destroy(); } diff -r c349bd73af71 -r b8da6a0b0da2 src/sun/sun.c --- a/src/sun/sun.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/sun/sun.c Wed Oct 24 07:34:02 2007 +0300 @@ -58,25 +58,25 @@ memset(&audio, 0, sizeof(struct sun_audio)); - cfgfile = bmp_cfg_db_open(); + cfgfile = aud_cfg_db_open(); /* Devices */ - bmp_cfg_db_get_string(cfgfile, "sun", "audio_devaudio", &audio.devaudio); - bmp_cfg_db_get_string(cfgfile, "sun", + aud_cfg_db_get_string(cfgfile, "sun", "audio_devaudio", &audio.devaudio); + aud_cfg_db_get_string(cfgfile, "sun", "audio_devaudioctl", &audio.devaudioctl); - bmp_cfg_db_get_string(cfgfile, "sun", "audio_devmixer", &audio.devmixer); + aud_cfg_db_get_string(cfgfile, "sun", "audio_devmixer", &audio.devmixer); /* Buffering */ - bmp_cfg_db_get_int(cfgfile, "sun", + aud_cfg_db_get_int(cfgfile, "sun", "buffer_size", &audio.req_buffer_size); - bmp_cfg_db_get_int(cfgfile, "sun", + aud_cfg_db_get_int(cfgfile, "sun", "prebuffer_size", &audio.req_prebuffer_size); /* Mixer */ - bmp_cfg_db_get_string(cfgfile, "sun", "mixer_voldev", &audio.mixer_voldev); - bmp_cfg_db_get_bool(cfgfile, "sun", + aud_cfg_db_get_string(cfgfile, "sun", "mixer_voldev", &audio.mixer_voldev); + aud_cfg_db_get_bool(cfgfile, "sun", "mixer_keepopen", &audio.mixer_keepopen); - bmp_cfg_db_close(cfgfile); + aud_cfg_db_close(cfgfile); /* Audio device path */ if ((s = getenv("AUDIODEVICE"))) diff -r c349bd73af71 -r b8da6a0b0da2 src/timidity/xmms-timidity.c --- a/src/timidity/xmms-timidity.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/timidity/xmms-timidity.c Wed Oct 24 07:34:02 2007 +0300 @@ -90,16 +90,16 @@ xmmstimid_cfg.channels = 2; xmmstimid_cfg.buffer_size = 512; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - if (! bmp_cfg_db_get_string(db, "timidity", "config_file", + if (! aud_cfg_db_get_string(db, "timidity", "config_file", &xmmstimid_cfg.config_file)) xmmstimid_cfg.config_file = g_strdup("/etc/timidity/timidity.cfg"); - bmp_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate); - bmp_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits); - bmp_cfg_db_get_int(db, "timidity", "channels", &xmmstimid_cfg.channels); - bmp_cfg_db_close(db); + aud_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate); + aud_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits); + aud_cfg_db_get_int(db, "timidity", "channels", &xmmstimid_cfg.channels); + aud_cfg_db_close(db); if (mid_init(xmmstimid_cfg.config_file) != 0) { xmmstimid_initialized = FALSE; @@ -203,18 +203,18 @@ else if (gtk_toggle_button_get_active(xmmstimid_conf_channels_2)) xmmstimid_cfg.channels = 2; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); g_free(xmmstimid_cfg.config_file); xmmstimid_cfg.config_file = g_strdup( gtk_entry_get_text(xmmstimid_conf_config_file)); - bmp_cfg_db_set_string(db, "timidity", "config_file", xmmstimid_cfg.config_file); + aud_cfg_db_set_string(db, "timidity", "config_file", xmmstimid_cfg.config_file); - bmp_cfg_db_set_int(db, "timidity", "samplerate", xmmstimid_cfg.rate); - bmp_cfg_db_set_int(db, "timidity", "bits", xmmstimid_cfg.bits); - bmp_cfg_db_set_int(db, "timidity", "channels", xmmstimid_cfg.channels); - bmp_cfg_db_close(db); + aud_cfg_db_set_int(db, "timidity", "samplerate", xmmstimid_cfg.rate); + aud_cfg_db_set_int(db, "timidity", "bits", xmmstimid_cfg.bits); + aud_cfg_db_set_int(db, "timidity", "channels", xmmstimid_cfg.channels); + aud_cfg_db_close(db); gtk_widget_hide(xmmstimid_conf_wnd); } diff -r c349bd73af71 -r b8da6a0b0da2 src/vorbis/configure.c --- a/src/vorbis/configure.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/vorbis/configure.c Wed Oct 24 07:34:02 2007 +0300 @@ -49,19 +49,19 @@ else vorbis_cfg.replaygain_mode = REPLAYGAIN_MODE_ALBUM; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_set_bool(db, "vorbis", "tag_override", + aud_cfg_db_set_bool(db, "vorbis", "tag_override", vorbis_cfg.tag_override); - bmp_cfg_db_set_string(db, "vorbis", "tag_format", vorbis_cfg.tag_format); - bmp_cfg_db_set_bool(db, "vorbis", "use_anticlip", + aud_cfg_db_set_string(db, "vorbis", "tag_format", vorbis_cfg.tag_format); + aud_cfg_db_set_bool(db, "vorbis", "use_anticlip", vorbis_cfg.use_anticlip); - bmp_cfg_db_set_bool(db, "vorbis", "use_replaygain", + aud_cfg_db_set_bool(db, "vorbis", "use_replaygain", vorbis_cfg.use_replaygain); - bmp_cfg_db_set_int(db, "vorbis", "replaygain_mode", + aud_cfg_db_set_int(db, "vorbis", "replaygain_mode", vorbis_cfg.replaygain_mode); - bmp_cfg_db_set_bool(db, "vorbis", "use_booster", vorbis_cfg.use_booster); - bmp_cfg_db_close(db); + aud_cfg_db_set_bool(db, "vorbis", "use_booster", vorbis_cfg.use_booster); + aud_cfg_db_close(db); gtk_widget_destroy(vorbis_configurewin); } diff -r c349bd73af71 -r b8da6a0b0da2 src/vorbis/vorbis.c --- a/src/vorbis/vorbis.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/vorbis/vorbis.c Wed Oct 24 07:34:02 2007 +0300 @@ -887,42 +887,42 @@ vorbis_cfg.replaygain_mode = REPLAYGAIN_MODE_TRACK; vorbis_cfg.use_booster = FALSE; - db = bmp_cfg_db_open(); - bmp_cfg_db_get_int(db, "vorbis", "http_buffer_size", + db = aud_cfg_db_open(); + aud_cfg_db_get_int(db, "vorbis", "http_buffer_size", &vorbis_cfg.http_buffer_size); - bmp_cfg_db_get_int(db, "vorbis", "http_prebuffer", + aud_cfg_db_get_int(db, "vorbis", "http_prebuffer", &vorbis_cfg.http_prebuffer); - bmp_cfg_db_get_bool(db, "vorbis", "save_http_stream", + aud_cfg_db_get_bool(db, "vorbis", "save_http_stream", &vorbis_cfg.save_http_stream); - if (!bmp_cfg_db_get_string(db, "vorbis", "save_http_path", + if (!aud_cfg_db_get_string(db, "vorbis", "save_http_path", &vorbis_cfg.save_http_path)) vorbis_cfg.save_http_path = g_strdup(g_get_home_dir()); - bmp_cfg_db_get_bool(db, "vorbis", "tag_override", + aud_cfg_db_get_bool(db, "vorbis", "tag_override", &vorbis_cfg.tag_override); - if (!bmp_cfg_db_get_string(db, "vorbis", "tag_format", + if (!aud_cfg_db_get_string(db, "vorbis", "tag_format", &vorbis_cfg.tag_format)) vorbis_cfg.tag_format = g_strdup("%p - %t"); - bmp_cfg_db_get_bool(db, "vorbis", "use_anticlip", + aud_cfg_db_get_bool(db, "vorbis", "use_anticlip", &vorbis_cfg.use_anticlip); - bmp_cfg_db_get_bool(db, "vorbis", "use_replaygain", + aud_cfg_db_get_bool(db, "vorbis", "use_replaygain", &vorbis_cfg.use_replaygain); - bmp_cfg_db_get_int(db, "vorbis", "replaygain_mode", + aud_cfg_db_get_int(db, "vorbis", "replaygain_mode", &vorbis_cfg.replaygain_mode); - bmp_cfg_db_get_bool(db, "vorbis", "use_booster", &vorbis_cfg.use_booster); + aud_cfg_db_get_bool(db, "vorbis", "use_booster", &vorbis_cfg.use_booster); - bmp_cfg_db_get_bool(db, NULL, "use_proxy", &vorbis_cfg.use_proxy); - bmp_cfg_db_get_string(db, NULL, "proxy_host", &vorbis_cfg.proxy_host); - bmp_cfg_db_get_string(db, NULL, "proxy_port", &tmp); + aud_cfg_db_get_bool(db, NULL, "use_proxy", &vorbis_cfg.use_proxy); + aud_cfg_db_get_string(db, NULL, "proxy_host", &vorbis_cfg.proxy_host); + aud_cfg_db_get_string(db, NULL, "proxy_port", &tmp); if (tmp != NULL) vorbis_cfg.proxy_port = atoi(tmp); - bmp_cfg_db_get_bool(db, NULL, "proxy_use_auth", &vorbis_cfg.proxy_use_auth); - bmp_cfg_db_get_string(db, NULL, "proxy_user", &vorbis_cfg.proxy_user); - bmp_cfg_db_get_string(db, NULL, "proxy_pass", &vorbis_cfg.proxy_pass); + aud_cfg_db_get_bool(db, NULL, "proxy_use_auth", &vorbis_cfg.proxy_use_auth); + aud_cfg_db_get_string(db, NULL, "proxy_user", &vorbis_cfg.proxy_user); + aud_cfg_db_get_string(db, NULL, "proxy_pass", &vorbis_cfg.proxy_pass); - bmp_cfg_db_close(db); + aud_cfg_db_close(db); vf_mutex = g_mutex_new(); diff -r c349bd73af71 -r b8da6a0b0da2 src/vtx/vtx.c --- a/src/vtx/vtx.c Wed Oct 24 07:32:18 2007 +0300 +++ b/src/vtx/vtx.c Wed Oct 24 07:34:02 2007 +0300 @@ -61,13 +61,13 @@ vtx_init(void) { ConfigDb *db; - db = bmp_cfg_db_open(); + db = aud_cfg_db_open(); - bmp_cfg_db_get_int(db, NULL, "src_rate", &freq); + aud_cfg_db_get_int(db, NULL, "src_rate", &freq); if (freq < 4000 || freq > 192000) freq = 44100; - bmp_cfg_db_close(db); + aud_cfg_db_close(db); } int diff -r c349bd73af71 -r b8da6a0b0da2 src/wavpack/libwavpack.cxx --- a/src/wavpack/libwavpack.cxx Wed Oct 24 07:32:18 2007 +0300 +++ b/src/wavpack/libwavpack.cxx Wed Oct 24 07:34:02 2007 +0300 @@ -532,15 +532,15 @@ { ConfigDb *cfg; - cfg = bmp_cfg_db_open(); + cfg = aud_cfg_db_open(); - bmp_cfg_db_get_bool(cfg, "wavpack", "clip_prevention", + aud_cfg_db_get_bool(cfg, "wavpack", "clip_prevention", &clipPreventionEnabled); - bmp_cfg_db_get_bool(cfg, "wavpack", "album_replaygain", + aud_cfg_db_get_bool(cfg, "wavpack", "album_replaygain", &albumReplaygainEnabled); - bmp_cfg_db_get_bool(cfg, "wavpack", "dyn_bitrate", &dynBitrateEnabled); - bmp_cfg_db_get_bool(cfg, "wavpack", "replaygain", &replaygainEnabled); - bmp_cfg_db_close(cfg); + aud_cfg_db_get_bool(cfg, "wavpack", "dyn_bitrate", &dynBitrateEnabled); + aud_cfg_db_get_bool(cfg, "wavpack", "replaygain", &replaygainEnabled); + aud_cfg_db_close(cfg); openedAudio = false; } diff -r c349bd73af71 -r b8da6a0b0da2 src/wavpack/ui.cxx --- a/src/wavpack/ui.cxx Wed Oct 24 07:32:18 2007 +0300 +++ b/src/wavpack/ui.cxx Wed Oct 24 07:34:02 2007 +0300 @@ -428,15 +428,15 @@ tb = GTK_TOGGLE_BUTTON(rg_track_gain); albumReplaygainEnabled = !gtk_toggle_button_get_active(tb); - cfg = bmp_cfg_db_open(); + cfg = aud_cfg_db_open(); - bmp_cfg_db_set_bool(cfg, "wavpack", "clip_prevention", + aud_cfg_db_set_bool(cfg, "wavpack", "clip_prevention", clipPreventionEnabled); - bmp_cfg_db_set_bool(cfg, "wavpack", "album_replaygain", + aud_cfg_db_set_bool(cfg, "wavpack", "album_replaygain", albumReplaygainEnabled); - bmp_cfg_db_set_bool(cfg, "wavpack", "dyn_bitrate", dynBitrateEnabled); - bmp_cfg_db_set_bool(cfg, "wavpack", "replaygain", replaygainEnabled); - bmp_cfg_db_close(cfg); + aud_cfg_db_set_bool(cfg, "wavpack", "dyn_bitrate", dynBitrateEnabled); + aud_cfg_db_set_bool(cfg, "wavpack", "replaygain", replaygainEnabled); + aud_cfg_db_close(cfg); gtk_widget_destroy(wv_configurewin); }