Mercurial > hg > xmms-sid
diff src/xs_config.c @ 722:5923dfff1fac
Unify xs_sid*_filter_t into one.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 10 Feb 2009 03:25:49 +0200 |
parents | 2b6a29eefffb |
children | 9321ffa2ea7e |
line wrap: on
line diff
--- a/src/xs_config.c Tue Feb 10 03:20:07 2009 +0200 +++ b/src/xs_config.c Tue Feb 10 03:25:49 2009 +0200 @@ -316,7 +316,7 @@ } -static void xs_filter_free(xs_sid2_filter_t *filter) +static void xs_filter_free(xs_sid_filter_t *filter) { if (filter) { g_free(filter->name); @@ -328,7 +328,7 @@ #define XS_FITEM (4 * 2) -static gboolean xs_filter_load_into(XS_CONFIG_FILE *cfg, gint nFilter, xs_sid2_filter_t *filter) +static gboolean xs_filter_load_into(XS_CONFIG_FILE *cfg, gint nFilter, xs_sid_filter_t *filter) { gchar tmpKey[64], *tmpStr; @@ -399,12 +399,12 @@ } -static xs_sid2_filter_t * xs_filter_load(XS_CONFIG_FILE *cfg, gint nFilter) +static xs_sid_filter_t * xs_filter_load(XS_CONFIG_FILE *cfg, gint nFilter) { - xs_sid2_filter_t *filter; + xs_sid_filter_t *filter; /* Allocate filter struct */ - if ((filter = g_malloc0(sizeof(xs_sid2_filter_t))) == NULL) + if ((filter = g_malloc0(sizeof(xs_sid_filter_t))) == NULL) return NULL; if (!xs_filter_load_into(cfg, nFilter, filter)) { @@ -417,7 +417,7 @@ #if 0 -static gboolean xs_filter_save(XS_CONFIG_FILE *cfg, xs_sid2_filter_t *pFilter, gint nFilter) +static gboolean xs_filter_save(XS_CONFIG_FILE *cfg, xs_sid_filter_t *pFilter, gint nFilter) { gchar *tmpValue, tmpKey[64]; gint i, j; @@ -469,7 +469,7 @@ } -static gboolean xs_chkf(xs_sid2_filter_t *filter, const gchar *str, const gchar *name, gint type) +static gboolean xs_chkf(xs_sid_filter_t *filter, const gchar *str, const gchar *name, gint type) { if (g_strncasecmp(str, name, strlen(name))) return FALSE; @@ -485,14 +485,14 @@ return TRUE; } -static gboolean xs_filters_import(const gchar *filename, xs_sid2_filter_t **pFilters, gint *nFilters) +static gboolean xs_filters_import(const gchar *filename, xs_sid_filter_t **pFilters, gint *nFilters) { FILE *inFile; gchar inLine[XS_BUF_SIZE], tmpStr[XS_BUF_SIZE]; gchar *sectName = NULL; gboolean inSection, isError = FALSE; size_t lineNum, i; - xs_sid2_filter_t *filter = NULL; + xs_sid_filter_t *filter = NULL; fprintf(stderr, "xs_filters_import(%s)\n", filename); @@ -539,7 +539,7 @@ if (inSection) { /* Submit definition */ fprintf(stderr, "filter ends: %s\n", sectName); - if ((filter = g_malloc0(sizeof(xs_sid2_filter_t))) == NULL) { + if ((filter = g_malloc0(sizeof(xs_sid_filter_t))) == NULL) { fprintf(stderr, "could not allocate ..\n"); } else { @@ -577,7 +577,7 @@ } -static gboolean xs_filter_export(FILE *outFile, xs_sid2_filter_t *filter) +static gboolean xs_filter_export(FILE *outFile, xs_sid_filter_t *filter) { fprintf(outFile, "[Filter%s]\n" @@ -629,7 +629,7 @@ } -static gboolean xs_filters_export(const gchar *filename, xs_sid2_filter_t **filters, gint nFilters) +static gboolean xs_filters_export(const gchar *filename, xs_sid_filter_t **filters, gint nFilters) { gboolean result = TRUE; FILE *outFile; @@ -715,7 +715,7 @@ xs_filter_load_into(cfg, 0, &xs_cfg.sid2Filter); if (xs_cfg.sid2NFilterPresets > 0) { - xs_cfg.sid2FilterPresets = g_malloc0(xs_cfg.sid2NFilterPresets * sizeof(xs_sid2_filter_t *)); + xs_cfg.sid2FilterPresets = g_malloc0(xs_cfg.sid2NFilterPresets * sizeof(xs_sid_filter_t *)); if (!xs_cfg.sid2FilterPresets) { xs_error("Allocation of sid2FilterPresets structure failed!\n"); } else { @@ -1032,7 +1032,7 @@ } -void xs_cfg_sp2_filter_update(XSCurve *curve, xs_sid2_filter_t *f) +void xs_cfg_sp2_filter_update(XSCurve *curve, xs_sid_filter_t *f) { assert(curve); assert(f);