FluidSynth · derselbst · May 11, 2019 · Dec 18, 2018 · Dec 18, 2018 · Dec 29, 2018
diff --git a/AUTHORS b/AUTHORS
@@ -122,8 +122,8 @@ summary of contributions.
 
 * Tom Moebert (fluidsynth's maintainer since Jun 2017) cleaned up and refactored
   fluidsynth's API and revised its documentation, added support for 24 bit sample
-  soundfonts, fixed various bugs, implemented unit tests and CI builds for
-  Windows, Linux, MacOSX.
+  soundfonts, added support for DLS soundfonts, fixed various bugs, implemented
+  unit tests and CI builds for Windows, Linux, MacOSX and BSD.
 
 * Growing list of individuals who contributed bug fixes, corrections and minor features:
 Nicolas Boulicault for ALSA sequencer midi.portname setting.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,6 +64,7 @@ option ( enable-dbus "compile DBUS support (if it is available)" on )
 option ( enable-ipv6  "enable ipv6 support" on )
 option ( enable-jack "compile JACK support (if it is available)" on )
 option ( enable-ladspa "enable LADSPA effect units" on )
+option ( enable-libinstpatch "use libinstpatch (if available) to load DLS and GIG files" on )
 option ( enable-libsndfile "compile libsndfile support (if it is available)" on )
 option ( enable-midishare "compile MidiShare support (if it is available)" on )
 option ( enable-opensles "compile OpenSLES support (if it is available)" off )
@@ -567,7 +568,13 @@ else(NOT enable-pkgconfig)
         set ( LADSPA 1 )
     endif ( LADSPA_SUPPORT )
     endif ( enable-ladspa )
-
+
+    unset ( LIBINSTPATCH_SUPPORT CACHE )
+    if ( enable-libinstpatch )
+        pkg_check_modules ( LIBINSTPATCH libinstpatch-1.0 )
+        set ( LIBINSTPATCH_SUPPORT ${LIBINSTPATCH_FOUND} )
+    endif ( enable-libinstpatch )
+
     unset ( SDL2_SUPPORT CACHE )
     if ( enable-sdl2 )
         pkg_check_modules ( SDL2 sdl2 )

diff --git a/cmake_admin/report.cmake b/cmake_admin/report.cmake
@@ -158,6 +158,12 @@ else ( WITH_READLINE )
   message ( "Readline:              no" )
 endif ( WITH_READLINE )
 
+if ( LIBINSTPATCH_SUPPORT )
+  message ( "libinstpatch:          yes" )
+else ( LIBINSTPATCH_SUPPORT )
+  message ( "libinstpatch:          no" )
+endif ( LIBINSTPATCH_SUPPORT )
+
 if ( WITH_FLOAT )
   message ( "Samples type=float:    yes" )
 else ( WITH_FLOAT )

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -31,13 +31,14 @@ include_directories (
     ${CMAKE_SOURCE_DIR}/src/bindings
     ${CMAKE_SOURCE_DIR}/include
     ${CMAKE_BINARY_DIR}/include
-    ${PTHREADS_INCLUDE_DIR}
-    ${SDL2_INCLUDE_DIR}
 )
 
 include_directories (
     SYSTEM
     ${GLIB_INCLUDE_DIRS}
+    ${PTHREADS_INCLUDE_DIR}
+    ${SDL2_INCLUDE_DIR}
+    ${LIBINSTPATCH_INCLUDE_DIRS}
 )
 
 # ************ library ************
@@ -127,6 +128,10 @@ if ( AUFILE_SUPPORT )
   set ( fluid_aufile_SOURCES drivers/fluid_aufile.c )
 endif ( AUFILE_SUPPORT )
 
+if ( LIBINSTPATCH_SUPPORT )
+  set ( fluid_libinstpatch_SOURCES sfloader/fluid_instpatch.c sfloader/fluid_instpatch.h )
+endif ( LIBINSTPATCH_SUPPORT )
+
 if ( OPENSLES_SUPPORT )
   set ( fluid_opensles_SOURCES drivers/fluid_opensles.c )
   include_directories ( ${OpenSLES_INCLUDE_DIRS} )
@@ -277,6 +282,7 @@ add_library ( libfluidsynth-OBJ OBJECT
     ${fluid_waveout_SOURCES}
     ${fluid_winmidi_SOURCES}
     ${fluid_sdl2_SOURCES}
+    ${fluid_libinstpatch_SOURCES}
     ${libfluidsynth_SOURCES}
     ${public_HEADERS}
     ${public_main_HEADER}
@@ -355,6 +361,7 @@ target_link_libraries ( libfluidsynth
     ${OpenSLES_LIBS}
     ${OBOE_LIBS}
     ${LIBFLUID_LIBS}
+    ${LIBINSTPATCH_LIBRARIES}
 )
 
 # ************ CLI program ************

diff --git a/src/config.cmake b/src/config.cmake
@@ -154,6 +154,9 @@
 /* Define to enable network support */
 #cmakedefine NETWORK_SUPPORT @NETWORK_SUPPORT@
 
+/* libinstpatch for DLS and GIG */
+#cmakedefine LIBINSTPATCH_SUPPORT @LIBINSTPATCH_SUPPORT@
+
 /* libsndfile has ogg vorbis support */
 #cmakedefine LIBSNDFILE_HASVORBIS @LIBSNDFILE_HASVORBIS@
 

diff --git a/src/fluidsynth.c b/src/fluidsynth.c
@@ -29,6 +29,9 @@
 #define GETOPT_SUPPORT 1
 #endif
 
+#ifdef LIBINSTPATCH_SUPPORT
+#include <libinstpatch/libinstpatch.h>
+#endif
 #include "fluid_lash.h"
 
 #ifdef SYSTEMD_SUPPORT
@@ -297,6 +300,22 @@ fast_render_loop(fluid_settings_t *settings, fluid_synth_t *synth, fluid_player_
     delete_fluid_file_renderer(renderer);
 }
 
+static int is_dls(const char* fname)
+{
+#ifdef LIBINSTPATCH_SUPPORT
+        IpatchFileHandle *fhandle = ipatch_file_identify_open (fname, NULL);
+        int ret = (fhandle != NULL);
+        if(ret)
+        {
+            ipatch_file_close(fhandle);
+        }
+
+        return ret;
+#else
+        return FALSE;
+#endif
+}
+
 /*
  * main
  * Process initialization steps in the following order:
@@ -766,7 +785,9 @@ int main(int argc, char **argv)
     /* load the soundfonts (check that all non options are SoundFont or MIDI files) */
     for(i = arg1; i < argc; i++)
     {
-        if(fluid_is_soundfont(argv[i]))
+        if(fluid_is_soundfont(argv[i])
+            || is_dls(argv[i])
+        )
         {
             if(fluid_synth_sfload(synth, argv[i], 1) == -1)
             {

diff --git a/src/sfloader/fluid_defsfont.c b/src/sfloader/fluid_defsfont.c
@@ -104,7 +104,7 @@ fluid_sfont_t *fluid_defsfloader_load(fluid_sfloader_t *loader, const char *file
 
     if(fluid_defsfont_load(defsfont, &loader->file_callbacks, filename) == FLUID_FAILED)
     {
-        fluid_sfont_delete_internal(sfont);
+        fluid_defsfont_sfont_delete(sfont);
         return NULL;
     }
 
@@ -425,7 +425,7 @@ int fluid_defsfont_load(fluid_defsfont_t *defsfont, const fluid_file_callbacks_t
 
     if(sfdata == NULL)
     {
-        FLUID_LOG(FLUID_ERR, "Couldn't load soundfont file");
+        /* error message already printed */
         return FLUID_FAILED;
     }