Update Fluidsynth to 2.0.1

[ardour.git] / libs / fluidsynth / src / fluid_settings.h

diff --git a/libs/fluidsynth/src/fluid_settings.h b/libs/fluidsynth/src/fluid_settings.h
index 244f0b457b3198712335574f3daeab2739cbd796..4a952f1bad7b7a752ac6da507fc164e265a88172 100644 (file)
--- a/libs/fluidsynth/src/fluid_settings.h
+++ b/libs/fluidsynth/src/fluid_settings.h
@@ -3,16 +3,16 @@
  * Copyright (C) 2003  Peter Hanappe and others.
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License
- * as published by the Free Software Foundation; either version 2 of
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
@@ -22,35 +22,34 @@
 #ifndef _FLUID_SETTINGS_H
 #define _FLUID_SETTINGS_H
 
+int fluid_settings_add_option(fluid_settings_t *settings, const char *name, const char *s);
+int fluid_settings_remove_option(fluid_settings_t *settings, const char *name, const char *s);
 
 
-/** returns 1 if the option was added, 0 otherwise */
-int fluid_settings_add_option(fluid_settings_t* settings, const char* name, const char* s);
+typedef void (*fluid_str_update_t)(void *data, const char *name, const char *value);
 
-/** returns 1 if the option was added, 0 otherwise */
-int fluid_settings_remove_option(fluid_settings_t* settings, const char* name, const char* s);
+int fluid_settings_register_str(fluid_settings_t *settings, const char *name, const char *def, int hints);
+int fluid_settings_callback_str(fluid_settings_t *settings, const char *name,
+                                fluid_str_update_t fun, void *data);
 
 
-typedef int (*fluid_num_update_t)(void* data, const char* name, double value);
-typedef int (*fluid_str_update_t)(void* data, const char* name, const char* value);
-typedef int (*fluid_int_update_t)(void* data, const char* name, int value);
+typedef void (*fluid_num_update_t)(void *data, const char *name, double value);
 
-/** returns 0 if the value has been registered correctly, non-zero
-    otherwise */
-int fluid_settings_register_str(fluid_settings_t* settings, const char* name, const char* def, int hints,
-                              fluid_str_update_t fun, void* data);
+int fluid_settings_register_num(fluid_settings_t *settings, const char *name, double def,
+                                double min, double max, int hints);
+int fluid_settings_callback_num(fluid_settings_t *settings, const char *name,
+                                fluid_num_update_t fun, void *data);
 
-/** returns 0 if the value has been registered correctly, non-zero
-    otherwise */
-int fluid_settings_register_num(fluid_settings_t* settings, char* name, double def,
-                                double min, double max, int hints,
-                                fluid_num_update_t fun, void* data);
+/* Type specific wrapper for fluid_settings_getnum */
+int fluid_settings_getnum_float(fluid_settings_t *settings, const char *name, float *val);
 
-/** returns 0 if the value has been registered correctly, non-zero
-    otherwise */
-int fluid_settings_register_int(fluid_settings_t* settings, char* name, int def,
-                                int min, int max, int hints,
-                                fluid_int_update_t fun, void* data);
 
+typedef void (*fluid_int_update_t)(void *data, const char *name, int value);
+int fluid_settings_register_int(fluid_settings_t *settings, const char *name, int def,
+                                int min, int max, int hints);
+int fluid_settings_callback_int(fluid_settings_t *settings, const char *name,
+                                fluid_int_update_t fun, void *data);
+
+int fluid_settings_split_csv(const char *str, int *buf, int buf_len);
 
 #endif /* _FLUID_SETTINGS_H */