Added support for usage of FluidSynth v2

#26
WohlSoft · Jan 10, 2019 · c876be238b20e31ee3a94ab3d900248f5a5c0443 · c876be2
1 parent 6c6f382
commit c876be238b20e31ee3a94ab3d900248f5a5c0443
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/codecs/music_fluidsynth.c b/src/codecs/music_fluidsynth.c
@@ -32,14 +32,19 @@
 
 #include <fluidsynth.h>
 
+#if FLUIDSYNTH_VERSION_MAJOR >= 2
+    #define FLUID_DELETE_RETURNTYPE void
+#else
+    #define FLUID_DELETE_RETURNTYPE int
+#endif
 
 typedef struct {
     int loaded;
     void *handle;
 
-    int (*delete_fluid_player)(fluid_player_t*);
+    FLUID_DELETE_RETURNTYPE (*delete_fluid_player)(fluid_player_t*);
     void (*delete_fluid_settings)(fluid_settings_t*);
-    int (*delete_fluid_synth)(fluid_synth_t*);
+    FLUID_DELETE_RETURNTYPE (*delete_fluid_synth)(fluid_synth_t*);
     int (*fluid_player_add)(fluid_player_t*, const char*);
     int (*fluid_player_add_mem)(fluid_player_t*, const void*, size_t);
     int (*fluid_player_get_status)(fluid_player_t*);
@@ -78,9 +83,9 @@ static int FLUIDSYNTH_Load()
             return -1;
         }
 #endif
-        FUNCTION_LOADER(delete_fluid_player, int (*)(fluid_player_t*))
+        FUNCTION_LOADER(delete_fluid_player, FLUID_DELETE_RETURNTYPE (*)(fluid_player_t*))
         FUNCTION_LOADER(delete_fluid_settings, void (*)(fluid_settings_t*))
-        FUNCTION_LOADER(delete_fluid_synth, int (*)(fluid_synth_t*))
+        FUNCTION_LOADER(delete_fluid_synth, FLUID_DELETE_RETURNTYPE (*)(fluid_synth_t*))
         FUNCTION_LOADER(fluid_player_add, int (*)(fluid_player_t*, const char*))
         FUNCTION_LOADER(fluid_player_add_mem, int (*)(fluid_player_t*, const void*, size_t))
         FUNCTION_LOADER(fluid_player_get_status, int (*)(fluid_player_t*))