# HG changeset patch # User Matti Hamalainen # Date 1234228299 -7200 # Node ID 0feeaf698a543fcfd6d8e8f96bc1be5689a20a35 # Parent cab9d2b182e82ac3c8396b7f1c5c0aa88b31d590 Clean up the XS_CFG_* macros a bit. diff -r cab9d2b182e8 -r 0feeaf698a54 src/xs_config.c --- a/src/xs_config.c Tue Feb 10 03:07:34 2009 +0200 +++ b/src/xs_config.c Tue Feb 10 03:11:39 2009 +0200 @@ -24,32 +24,32 @@ #ifdef AUDACIOUS_PLUGIN #include -#define XS_CONFIG_FILE ConfigDb -#define XS_CONFIG_OPEN aud_cfg_db_open -#define XS_CONFIG_FREE aud_cfg_db_close +#define XS_CONFIG_FILE mcs_handle_t +#define XS_CONFIG_OPEN aud_cfg_db_open +#define XS_CONFIG_FREE aud_cfg_db_close -#define XS_CFG_SET_STRING aud_cfg_db_set_string -#define XS_CFG_SET_FLOAT aud_cfg_db_set_float -#define XS_CFG_SET_INT aud_cfg_db_set_int -#define XS_CFG_SET_BOOL aud_cfg_db_set_bool -#define XS_CFG_GET_STRING aud_cfg_db_get_string -#define XS_CFG_GET_FLOAT aud_cfg_db_get_float -#define XS_CFG_GET_INT aud_cfg_db_get_int -#define XS_CFG_GET_BOOL aud_cfg_db_get_bool +#define XS_CFG_SET_STRING(q,z) aud_cfg_db_set_string(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_SET_FLOAT(q,z) aud_cfg_db_set_float(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_SET_INT(q,z) aud_cfg_db_set_int(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_SET_BOOL(q,z) aud_cfg_db_set_bool(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_GET_STRING(q,z) aud_cfg_db_get_string(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_GET_FLOAT(q,z) aud_cfg_db_get_float(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_GET_INT(q,z) aud_cfg_db_get_int(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_GET_BOOL(q,z) aud_cfg_db_get_bool(cfg, XS_CONFIG_IDENT, q, z) #else #include -#define XS_CONFIG_FILE ConfigFile -#define XS_CONFIG_OPEN xmms_cfg_open_default_file -#define XS_CONFIG_FREE xmms_cfg_free +#define XS_CONFIG_FILE ConfigFile +#define XS_CONFIG_OPEN xmms_cfg_open_default_file +#define XS_CONFIG_FREE xmms_cfg_free -#define XS_CFG_SET_STRING xmms_cfg_write_string -#define XS_CFG_SET_FLOAT xmms_cfg_write_float -#define XS_CFG_SET_INT xmms_cfg_write_int -#define XS_CFG_SET_BOOL xmms_cfg_write_boolean -#define XS_CFG_GET_STRING xmms_cfg_read_string -#define XS_CFG_GET_FLOAT xmms_cfg_read_float -#define XS_CFG_GET_INT xmms_cfg_read_int -#define XS_CFG_GET_BOOL xmms_cfg_read_boolean +#define XS_CFG_SET_STRING(q,z) xmms_cfg_write_string(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_SET_FLOAT(q,z) xmms_cfg_write_float(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_SET_INT(q,z) xmms_cfg_write_int(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_SET_BOOL(q,z) xmms_cfg_write_boolean(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_GET_STRING(q,z) xmms_cfg_read_string(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_GET_FLOAT(q,z) xmms_cfg_read_float(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_GET_INT(q,z) xmms_cfg_read_int(cfg, XS_CONFIG_IDENT, q, z) +#define XS_CFG_GET_BOOL(q,z) xmms_cfg_read_boolean(cfg, XS_CONFIG_IDENT, q, z) #endif #include #include @@ -311,11 +311,11 @@ /* Get fields from config */ g_snprintf(tmpKey, sizeof(tmpKey), "filter%dNPoints", nFilter); - if (!XS_CFG_GET_INT(cfg, XS_CONFIG_IDENT, tmpKey, &(pResult->npoints))) + if (!XS_CFG_GET_INT(tmpKey, &(pResult->npoints))) return FALSE; g_snprintf(tmpKey, sizeof(tmpKey), "filter%dName", nFilter); - if (!XS_CFG_GET_STRING(cfg, XS_CONFIG_IDENT, tmpKey, &tmpStr)) + if (!XS_CFG_GET_STRING(tmpKey, &tmpStr)) return FALSE; pResult->name = g_strdup(tmpStr); @@ -325,7 +325,7 @@ } g_snprintf(tmpKey, sizeof(tmpKey), "filter%dPoints", nFilter); - if (!XS_CFG_GET_STRING(cfg, XS_CONFIG_IDENT, tmpKey, &tmpStr)) + if (!XS_CFG_GET_STRING(tmpKey, &tmpStr)) return FALSE; for (i = 0, j = 0; i < pResult->npoints; i++, j += XS_FITEM) { @@ -374,13 +374,13 @@ /* Write into the configuration */ g_snprintf(tmpKey, sizeof(tmpKey), "filter%dName", nFilter); - XS_CFG_SET_STRING(cfg, XS_CONFIG_IDENT, tmpKey, pFilter->name); + XS_CFG_SET_STRING(tmpKey, pFilter->name); g_snprintf(tmpKey, sizeof(tmpKey), "filter%dNPoints", nFilter); - XS_CFG_SET_INT(cfg, XS_CONFIG_IDENT, tmpKey, pFilter->npoints); + XS_CFG_SET_INT(tmpKey, pFilter->npoints); g_snprintf(tmpKey, sizeof(tmpKey), "filter%dPoints", nFilter); - XS_CFG_SET_STRING(cfg, XS_CONFIG_IDENT, tmpKey, tmpValue); + XS_CFG_SET_STRING(tmpKey, tmpValue); g_free(tmpValue); return TRUE; @@ -545,26 +545,23 @@ for (i = 0; i < xs_cfgtable_max; i++) { switch (xs_cfgtable[i].itemType) { case CTYPE_INT: - XS_CFG_GET_INT(cfg, XS_CONFIG_IDENT, - xs_cfgtable[i].itemName, + XS_CFG_GET_INT(xs_cfgtable[i].itemName, (gint *) xs_cfgtable[i].itemData); break; case CTYPE_BOOL: - XS_CFG_GET_BOOL(cfg, XS_CONFIG_IDENT, - xs_cfgtable[i].itemName, + XS_CFG_GET_BOOL(xs_cfgtable[i].itemName, (gboolean *) xs_cfgtable[i].itemData); break; case CTYPE_FLOAT: - XS_CFG_GET_FLOAT(cfg, XS_CONFIG_IDENT, - xs_cfgtable[i].itemName, + XS_CFG_GET_FLOAT(xs_cfgtable[i].itemName, (gfloat *) xs_cfgtable[i].itemData); break; case CTYPE_STR: - if (XS_CFG_GET_STRING(cfg, XS_CONFIG_IDENT, - xs_cfgtable[i].itemName, (gchar **) &tmpStr)) { + if (XS_CFG_GET_STRING(xs_cfgtable[i].itemName, + (gchar **) &tmpStr)) { xs_pstrcpy((gchar **) xs_cfgtable[i].itemData, tmpStr); g_free(tmpStr); } @@ -615,26 +612,22 @@ for (i = 0; i < xs_cfgtable_max; i++) { switch (xs_cfgtable[i].itemType) { case CTYPE_INT: - XS_CFG_SET_INT(cfg, XS_CONFIG_IDENT, - xs_cfgtable[i].itemName, + XS_CFG_SET_INT(xs_cfgtable[i].itemName, *(gint *) xs_cfgtable[i].itemData); break; case CTYPE_BOOL: - XS_CFG_SET_BOOL(cfg, XS_CONFIG_IDENT, - xs_cfgtable[i].itemName, + XS_CFG_SET_BOOL(xs_cfgtable[i].itemName, *(gboolean *) xs_cfgtable[i].itemData); break; case CTYPE_FLOAT: - XS_CFG_SET_FLOAT(cfg, XS_CONFIG_IDENT, - xs_cfgtable[i].itemName, + XS_CFG_SET_FLOAT(xs_cfgtable[i].itemName, *(gfloat *) xs_cfgtable[i].itemData); break; case CTYPE_STR: - XS_CFG_SET_STRING(cfg, XS_CONFIG_IDENT, - xs_cfgtable[i].itemName, + XS_CFG_SET_STRING(xs_cfgtable[i].itemName, *(gchar **) xs_cfgtable[i].itemData); break; }