cleanup public generator API

move fluid_gen_set_default_values(), enum fluid_gen_flags and struct _fluid_gen_t to private header because no other public function seems to need fluid_gen_t

include/fluidsynth/gen.h

@@ -103,31 +103,6 @@ enum fluid_gen_type {
 };
 
 
-/**
- * SoundFont generator structure.
- */
-typedef struct _fluid_gen_t
-{
-  unsigned char flags; /**< Is the generator set or not (#fluid_gen_flags) */
-  double val;          /**< The nominal value */
-  double mod;          /**< Change by modulators */
-  double nrpn;         /**< Change by NRPN messages */
-} fluid_gen_t;
-
-/**
- * Enum value for 'flags' field of #fluid_gen_t (not really flags).
- */
-enum fluid_gen_flags
-{
-  GEN_UNUSED,		/**< Generator value is not set */
-  GEN_SET,		/**< Generator value is set */
-  GEN_ABS_NRPN		/**< Generator is an absolute value */
-};
-
-FLUIDSYNTH_API int fluid_gen_set_default_values(fluid_gen_t* gen);
-
-
-
 #ifdef __cplusplus
 }
 #endif

src/sfloader/fluid_defsfont.h

@@ -29,6 +29,7 @@
 #include "fluidsynth_priv.h"
 #include "fluid_list.h"
 #include "fluid_mod.h"
+#include "fluid_gen.h"
 
 
 

src/synth/fluid_gen.c

@@ -93,7 +93,6 @@ fluid_gen_info_t fluid_gen_info[] = {
  * Set an array of generators to their default values.
  * @param gen Array of generators (should be #GEN_LAST in size).
  * @return Always returns #FLUID_OK
- * @deprecated Will be removed from the public API in a future release, because there is no current usecase for it.
  */
 int
 fluid_gen_set_default_values(fluid_gen_t* gen)

src/synth/fluid_gen.h

@@ -33,12 +33,34 @@ typedef struct _fluid_gen_info_t {
 	float def;		/* The default value (cfr. fluid_gen_set_default_values()) */
 } fluid_gen_info_t;
 
+/**
+ * SoundFont generator structure.
+ */
+typedef struct _fluid_gen_t
+{
+  unsigned char flags; /**< Is the generator set or not (#fluid_gen_flags) */
+  double val;          /**< The nominal value */
+  double mod;          /**< Change by modulators */
+  double nrpn;         /**< Change by NRPN messages */
+} fluid_gen_t;
+
+/**
+ * Enum value for 'flags' field of #fluid_gen_t (not really flags).
+ */
+enum fluid_gen_flags
+{
+  GEN_UNUSED,		/**< Generator value is not set */
+  GEN_SET,		/**< Generator value is set */
+  GEN_ABS_NRPN		/**< Generator is an absolute value */
+};
+
 #define fluid_gen_set_mod(_gen, _val)  { (_gen)->mod = (double) (_val); }
 #define fluid_gen_set_nrpn(_gen, _val) { (_gen)->nrpn = (double) (_val); }
 
 fluid_real_t fluid_gen_scale(int gen, float value);
 fluid_real_t fluid_gen_scale_nrpn(int gen, int nrpn);
 int fluid_gen_init(fluid_gen_t* gen, fluid_channel_t* channel);
+int fluid_gen_set_default_values(fluid_gen_t* gen);
 
 
 #endif /* _FLUID_GEN_H */