updated FluidSynth to 2.4.8

Author: coelckers

thirdparty/fluidsynth/include/fluidsynth/midi.h

@@ -283,6 +283,7 @@ FLUIDSYNTH_API int fluid_player_get_status(fluid_player_t *player);
 FLUIDSYNTH_API int fluid_player_get_current_tick(fluid_player_t *player);
 FLUIDSYNTH_API int fluid_player_get_total_ticks(fluid_player_t *player);
 FLUIDSYNTH_API int fluid_player_get_bpm(fluid_player_t *player);
+FLUIDSYNTH_API int fluid_player_get_division(fluid_player_t *player);
 FLUIDSYNTH_API int fluid_player_get_midi_tempo(fluid_player_t *player);
 FLUIDSYNTH_API int fluid_player_seek(fluid_player_t *player, int ticks);
 /* @} */

thirdparty/fluidsynth/include/fluidsynth/mod.h

@@ -57,6 +57,15 @@ enum fluid_mod_flags
     FLUID_MOD_SIN = 0x80,            /**< Custom non-standard sinus mapping function */
 };
 
+/**
+ * Transform types for the SoundFont2 modulators as defined by SoundFont 2.04 section 8.3.
+ */
+enum fluid_mod_transforms
+{
+    FLUID_MOD_TRANSFORM_LINEAR = 0, /**< Linear: directly add the computed value to summing node */
+    FLUID_MOD_TRANSFORM_ABS = 2     /**< Abs: add the absolute value of the computed to summing node */
+};
+
 /**
  * General controller (if #FLUID_MOD_GC in flags).  This
  * corresponds to SoundFont 2.04 PDF section 8.2.1
@@ -83,13 +92,15 @@ FLUIDSYNTH_API void fluid_mod_set_source1(fluid_mod_t *mod, int src, int flags);
 FLUIDSYNTH_API void fluid_mod_set_source2(fluid_mod_t *mod, int src, int flags);
 FLUIDSYNTH_API void fluid_mod_set_dest(fluid_mod_t *mod, int dst);
 FLUIDSYNTH_API void fluid_mod_set_amount(fluid_mod_t *mod, double amount);
+FLUIDSYNTH_API void fluid_mod_set_transform(fluid_mod_t *mod, int type);
 
 FLUIDSYNTH_API int fluid_mod_get_source1(const fluid_mod_t *mod);
 FLUIDSYNTH_API int fluid_mod_get_flags1(const fluid_mod_t *mod);
 FLUIDSYNTH_API int fluid_mod_get_source2(const fluid_mod_t *mod);
 FLUIDSYNTH_API int fluid_mod_get_flags2(const fluid_mod_t *mod);
 FLUIDSYNTH_API int fluid_mod_get_dest(const fluid_mod_t *mod);
 FLUIDSYNTH_API double fluid_mod_get_amount(const fluid_mod_t *mod);
+FLUIDSYNTH_API int fluid_mod_get_transform(fluid_mod_t *mod);
 
 FLUIDSYNTH_API int fluid_mod_test_identity(const fluid_mod_t *mod1, const fluid_mod_t *mod2);
 FLUIDSYNTH_API int fluid_mod_has_source(const fluid_mod_t *mod, int cc, int ctrl);

thirdparty/fluidsynth/include/fluidsynth/types.h

@@ -55,8 +55,6 @@ typedef struct _fluid_shell_t fluid_shell_t;                    /**< Command she
 typedef struct _fluid_server_t fluid_server_t;                  /**< TCP/IP shell server instance */
 typedef struct _fluid_event_t fluid_event_t;                    /**< Sequencer event */
 typedef struct _fluid_sequencer_t fluid_sequencer_t;            /**< Sequencer instance */
-typedef struct _fluid_ramsfont_t fluid_ramsfont_t;              /**< RAM SoundFont */
-typedef struct _fluid_rampreset_t fluid_rampreset_t;            /**< RAM SoundFont preset */
 typedef struct _fluid_cmd_handler_t fluid_cmd_handler_t;        /**< Shell Command Handler */
 typedef struct _fluid_ladspa_fx_t fluid_ladspa_fx_t;            /**< LADSPA effects instance */
 typedef struct _fluid_file_callbacks_t fluid_file_callbacks_t;  /**< Callback struct to perform custom file loading of soundfonts */

thirdparty/fluidsynth/include/fluidsynth/version.h

@@ -31,9 +31,9 @@ extern "C" {
  *
  * @{
  */
-#define FLUIDSYNTH_VERSION       "2.2.8"           /**< String constant of libfluidsynth version. */
+#define FLUIDSYNTH_VERSION       "2.4.8"           /**< String constant of libfluidsynth version. */
 #define FLUIDSYNTH_VERSION_MAJOR 2     /**< libfluidsynth major version integer constant. */
-#define FLUIDSYNTH_VERSION_MINOR 2     /**< libfluidsynth minor version integer constant. */
+#define FLUIDSYNTH_VERSION_MINOR 4     /**< libfluidsynth minor version integer constant. */
 #define FLUIDSYNTH_VERSION_MICRO 8     /**< libfluidsynth micro version integer constant. */
 
 FLUIDSYNTH_API void fluid_version(int *major, int *minor, int *micro);

thirdparty/fluidsynth/src/CMakeLists.txt

@@ -1,6 +1,6 @@
 # FluidSynth - A Software Synthesizer
 #
-# Copyright (C) 2003-2010 Peter Hanappe and others.
+# Copyright (C) 2003-2025 Peter Hanappe and others.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public License
@@ -55,11 +55,12 @@ set ( fluidsynth_SOURCES
     rvoice/fluid_chorus.h
     rvoice/fluid_iir_filter.c
     rvoice/fluid_iir_filter.h
+    rvoice/fluid_iir_filter_impl.cpp
     rvoice/fluid_lfo.c
     rvoice/fluid_lfo.h
     rvoice/fluid_rvoice.h
     rvoice/fluid_rvoice.c
-    rvoice/fluid_rvoice_dsp.c
+    rvoice/fluid_rvoice_dsp.cpp
     rvoice/fluid_rvoice_event.h
     rvoice/fluid_rvoice_event.c
     rvoice/fluid_rvoice_mixer.h

thirdparty/fluidsynth/src/bindings/fluid_filerenderer.c

@@ -288,9 +288,43 @@ new_fluid_file_renderer(fluid_synth_t *synth)
         FLUID_LOG(FLUID_ERR, "Invalid or unsupported audio file format settings");
         goto error_recovery;
     }
-
+    
+#if defined( _WIN32 ) && defined( _UNICODE )
+    if (0 == FLUID_STRCMP("-", filename))
+    {
+        dev->sndfile = sf_open(filename, SFM_WRITE, &info);
+    }
+    else
+    {
+        int u16_count;
+        LPWSTR wc_filename;
+        dev->sndfile = NULL;
+        
+               // utf-8 filename to utf-16 wc_filename
+        if (1 > (u16_count = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename, -1, NULL, 0)))
+        {
+            FLUID_LOG(FLUID_ERR, "Failed to convert UTF8 string to wide char string");
+        }
+        else if (NULL == (wc_filename = (LPWSTR)FLUID_ARRAY(WCHAR, u16_count)))
+        {
+            FLUID_LOG(FLUID_ERR, "Out of memory");
+        }
+        else
+        {
+            if (u16_count != MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename, -1, wc_filename, u16_count))
+            {
+                FLUID_LOG(FLUID_ERR, "Failed to convert UTF8 string to wide char string");
+            }
+            else
+            {
+                dev->sndfile = sf_wchar_open(wc_filename, SFM_WRITE, &info);
+            }
+            FLUID_FREE(wc_filename);
+        }
+    }
+#else
     dev->sndfile = sf_open(filename, SFM_WRITE, &info);
-
+#endif
     if(!dev->sndfile)
     {
         FLUID_LOG(FLUID_ERR, "Failed to open audio file '%s' for writing", filename);

thirdparty/fluidsynth/src/drivers/fluid_adriver.c

@@ -170,6 +170,16 @@ static const fluid_audriver_definition_t fluid_audio_drivers[] =
     },
 #endif
 
+#if KAI_SUPPORT
+    {
+        "kai",
+        new_fluid_kai_audio_driver,
+        NULL,
+        delete_fluid_kai_audio_driver,
+        fluid_kai_audio_driver_settings
+    },
+#endif
+
 #if DART_SUPPORT
     {
         "dart",
@@ -180,6 +190,16 @@ static const fluid_audriver_definition_t fluid_audio_drivers[] =
     },
 #endif
 
+#if SDL3_SUPPORT
+    {
+        "sdl3",
+        new_fluid_sdl3_audio_driver,
+        NULL,
+        delete_fluid_sdl3_audio_driver,
+        fluid_sdl3_audio_driver_settings
+    },
+#endif
+
 #if SDL2_SUPPORT
     {
         "sdl2",
@@ -220,7 +240,7 @@ void fluid_audio_driver_settings(fluid_settings_t *settings)
     fluid_settings_add_option(settings, "audio.sample-format", "16bits");
     fluid_settings_add_option(settings, "audio.sample-format", "float");
 
-#if defined(WIN32)
+#if defined(_WIN32)
     fluid_settings_register_int(settings, "audio.period-size", 512, 64, 8192, 0);
     fluid_settings_register_int(settings, "audio.periods", 8, 2, 64, 0);
 #elif defined(MACOS9)
@@ -446,7 +466,7 @@ delete_fluid_audio_driver(fluid_audio_driver_t *driver)
  *
  * @warning This function may only be called if no thread is residing in fluidsynth's API and no instances of any kind
  * are alive (e.g. as it would be the case right after fluidsynth's initial creation). Else the behaviour is undefined.
- * Furtermore any attempt of using audio drivers that have not been registered is undefined behaviour!
+ * Furthermore any attempt of using audio drivers that have not been registered is undefined behaviour!
  *
  * @note This function is not thread safe and will never be!
  *

thirdparty/fluidsynth/src/drivers/fluid_adriver.h

@@ -159,6 +159,13 @@ fluid_audio_driver_t *new_fluid_sndmgr_audio_driver2(fluid_settings_t *settings,
 void delete_fluid_sndmgr_audio_driver(fluid_audio_driver_t *p);
 #endif
 
+#if KAI_SUPPORT
+fluid_audio_driver_t *new_fluid_kai_audio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+void delete_fluid_kai_audio_driver(fluid_audio_driver_t *p);
+void fluid_kai_audio_driver_settings(fluid_settings_t *settings);
+#endif
+
 #if DART_SUPPORT
 fluid_audio_driver_t *new_fluid_dart_audio_driver(fluid_settings_t *settings,
         fluid_synth_t *synth);
@@ -173,6 +180,13 @@ void delete_fluid_sdl2_audio_driver(fluid_audio_driver_t *p);
 void fluid_sdl2_audio_driver_settings(fluid_settings_t *settings);
 #endif
 
+#if SDL3_SUPPORT
+fluid_audio_driver_t *new_fluid_sdl3_audio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+void delete_fluid_sdl3_audio_driver(fluid_audio_driver_t *p);
+void fluid_sdl3_audio_driver_settings(fluid_settings_t *settings);
+#endif
+
 #if AUFILE_SUPPORT
 fluid_audio_driver_t *new_fluid_file_audio_driver(fluid_settings_t *settings,
         fluid_synth_t *synth);