zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-02-22 11:51:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

adjust signature of fluid_settings_getstr_default()

Browse source 
for consistency
This commit is contained in:
derselbst 2018-01-26 20:32:09 +01:00
parent 4a655de242
commit 94b26e6365
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/fluidsynth/settings.h
View file

@ -138,7 +138,7 @@ FLUIDSYNTH_API
int fluid_settings_dupstr(fluid_settings_t* settings, const char *name, char** str); int fluid_settings_dupstr(fluid_settings_t* settings, const char *name, char** str);
FLUIDSYNTH_API FLUIDSYNTH_API
char* fluid_settings_getstr_default(fluid_settings_t* settings, const char *name); int fluid_settings_getstr_default(fluid_settings_t* settings, const char *name, char** def);
FLUIDSYNTH_API FLUIDSYNTH_API
int fluid_settings_str_equal(fluid_settings_t* settings, const char *name, const char *value); int fluid_settings_str_equal(fluid_settings_t* settings, const char *name, const char *value);

4
src/bindings/fluid_cmd.c
View file

@ -1602,8 +1602,8 @@ fluid_handle_info(void* d, int ac, char** av, fluid_ostream_t out)
fluid_ostream_printf(out, "%s:\n", av[0]); fluid_ostream_printf(out, "%s:\n", av[0]);
fluid_ostream_printf(out, "Type: string\n"); fluid_ostream_printf(out, "Type: string\n");
fluid_ostream_printf(out, "Value: %s\n", s ? s : "NULL"); fluid_ostream_printf(out, "Value: %s\n", s ? s : "NULL");
fluid_ostream_printf(out, "Default value: %s\n", fluid_settings_getstr_default(settings, av[0], &s);
fluid_settings_getstr_default(settings, av[0])); fluid_ostream_printf(out, "Default value: %s\n", s);
if (s) FLUID_FREE (s); if (s) FLUID_FREE (s);

2
src/fluidsynth.c
View file

@ -188,7 +188,7 @@ settings_foreach_func (void *data, const char *name, int type)
case FLUID_STR_TYPE: case FLUID_STR_TYPE:
printf ("%-24s STR", name); printf ("%-24s STR", name);
defstr = fluid_settings_getstr_default (settings, name); fluid_settings_getstr_default (settings, name, &defstr);
count = fluid_settings_option_count (settings, name); count = fluid_settings_option_count (settings, name);
if (defstr || count > 0) if (defstr || count > 0)

16
src/utils/fluid_settings.c
View file

@ -1048,17 +1048,18 @@ fluid_settings_str_equal (fluid_settings_t* settings, const char *name, const ch
* *
* @param settings a settings object * @param settings a settings object
* @param name a setting's name * @param name a setting's name
* @return the default string value of the setting if it exists, NULL otherwise * @param def the default string value of the setting if it exists
* @return FLUID_OK on success, FLUID_FAILED otherwise
*/ */
char* int
fluid_settings_getstr_default(fluid_settings_t* settings, const char *name) fluid_settings_getstr_default(fluid_settings_t* settings, const char *name, char** def)
{ {
fluid_setting_node_t *node; fluid_setting_node_t *node;
char *retval = NULL; char *retval = NULL;
fluid_return_val_if_fail (settings != NULL, NULL); fluid_return_val_if_fail (settings != NULL, FLUID_FAILED);
fluid_return_val_if_fail (name != NULL, NULL); fluid_return_val_if_fail (name != NULL, FLUID_FAILED);
fluid_return_val_if_fail (name[0] != '\0', NULL); fluid_return_val_if_fail (name[0] != '\0', FLUID_FAILED);
fluid_rec_mutex_lock (settings->mutex); fluid_rec_mutex_lock (settings->mutex);
@ -1078,9 +1079,10 @@ fluid_settings_getstr_default(fluid_settings_t* settings, const char *name)
} }
} }
*def = retval;
fluid_rec_mutex_unlock (settings->mutex); fluid_rec_mutex_unlock (settings->mutex);
return retval; return retval != NULL ? FLUID_OK : FLUID_FAILED;
} }
/** /**