zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-01-19 07:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove deprecated fluid_settings_getstr()

Browse source
This commit is contained in:
derselbst 2017-09-16 17:30:57 +02:00
parent b44fb5c229
commit 53fd1eeac7
3 changed files with 5 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/fluidsynth/settings.h
View file

@ -137,9 +137,6 @@ int fluid_settings_copystr(fluid_settings_t* settings, const char *name, char *s
FLUIDSYNTH_API
int fluid_settings_dupstr(fluid_settings_t* settings, const char *name, char** str);
FLUIDSYNTH_API
int fluid_settings_getstr(fluid_settings_t* settings, const char *name, char** str);
FLUIDSYNTH_API
char* fluid_settings_getstr_default(fluid_settings_t* settings, const char *name);

4
src/fluidsynth.c
View file

@ -714,10 +714,12 @@ int main(int argc, char** argv)
if (fluid_synth_get_sfont(synth, 0) == NULL) {
/* Try to load the default soundfont if no soundfont specified */
char *s;
if (fluid_settings_getstr(settings, "synth.default-soundfont", &s) <= 0)
if (fluid_settings_dupstr(settings, "synth.default-soundfont", &s) <= 0)
s = NULL;
if ((s != NULL) && (s[0] != '\0'))
fluid_synth_sfload(synth, s, 1);
FLUID_FREE(s);
}
fluid_player_play(player);

60
src/utils/fluid_settings.c
View file

@ -735,7 +735,7 @@ fluid_settings_setstr(fluid_settings_t* settings, const char *name, const char *
}
/**
* Copy the value of a string setting
* Copy the value of a string setting into the provided buffer (thread safe)
* @param settings a settings object
* @param name a setting's name
* @param str Caller supplied buffer to copy string value to
@ -744,8 +744,7 @@ fluid_settings_setstr(fluid_settings_t* settings, const char *name, const char *
* @return 1 if the value exists, 0 otherwise
* @since 1.1.0
*
* Like fluid_settings_getstr() but is thread safe. A size of 256 should be
* more than sufficient for the string buffer.
* @note A size of 256 should be more than sufficient for the string buffer.
*/
int
fluid_settings_copystr(fluid_settings_t* settings, const char *name,
@ -854,61 +853,6 @@ fluid_settings_dupstr(fluid_settings_t* settings, const char *name, char** str)
return retval;
}
/**
* Get the value of a string setting
* @param settings a settings object
* @param name a setting's name
* @param str Location to store pointer to the settings string value
* @return 1 if the value exists, 0 otherwise
* @deprecated
*
* If the value does not exists, 'str' is set to NULL. Otherwise, 'str' will
* point to the value. The application does not own the returned value and it
* is valid only until a new value is assigned to the setting of the given name.
*
* NOTE: In a multi-threaded environment, caller must ensure that the setting
* being read by fluid_settings_getstr() is not assigned during the
* duration of callers use of the setting's value. Use fluid_settings_copystr()
* or fluid_settings_dupstr() which does not have this restriction.
*/
int
fluid_settings_getstr(fluid_settings_t* settings, const char *name, char** str)
{
fluid_setting_node_t *node;
int retval = 0;
fluid_return_val_if_fail (settings != NULL, 0);
fluid_return_val_if_fail (name != NULL, 0);
fluid_return_val_if_fail (name[0] != '\0', 0);
fluid_return_val_if_fail (str != NULL, 0);
fluid_rec_mutex_lock (settings->mutex);
if (fluid_settings_get(settings, name, &node))
{
if (node->type == FLUID_STR_TYPE)
{
fluid_str_setting_t *setting = (fluid_str_setting_t *)node;
*str = setting->value;
retval = 1;
}
else if (node->type == FLUID_INT_TYPE) /* Handle boolean integers for backwards compatibility */
{
fluid_int_setting_t *setting = (fluid_int_setting_t *)node;
if (setting->hints & FLUID_HINT_TOGGLED)
{
*str = setting->value ? "yes" : "no";
retval = 1;
}
}
}
else *str = NULL;
fluid_rec_mutex_unlock (settings->mutex);
return retval;
}
/**
* Test a string setting for some value.