From 5851de9e0c8f13c7b802f1074f37b71b52d0fa2e Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 13 Oct 2019 10:09:51 +0300 Subject: [PATCH] - added dynamic loading of FluidSynth 2.x --- .../mididevices/music_fluidsynth_mididevice.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp b/libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp index fe8e6adde..8926ff067 100644 --- a/libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp +++ b/libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp @@ -138,8 +138,10 @@ protected: #ifdef __APPLE__ #define FLUIDSYNTHLIB1 "libfluidsynth.1.dylib" +#define FLUIDSYNTHLIB2 "libfluidsynth.2.dylib" #else // !__APPLE__ #define FLUIDSYNTHLIB1 "libfluidsynth.so.1" +#define FLUIDSYNTHLIB2 "libfluidsynth.so.2" #endif // __APPLE__ #endif @@ -547,19 +549,12 @@ bool FluidSynthMIDIDevice::LoadFluidSynth(const char *fluid_lib) return true; } -#ifdef FLUIDSYNTHLIB2 if(!FluidSynthModule.Load({FLUIDSYNTHLIB1, FLUIDSYNTHLIB2})) { if (printfunc) printfunc("Could not load " FLUIDSYNTHLIB1 " or " FLUIDSYNTHLIB2 "\n"); return false; } -#else - if(!FluidSynthModule.Load({fluid_lib, FLUIDSYNTHLIB1})) - { - if (printfunc) printfunc("Could not load " FLUIDSYNTHLIB1 ": %s\n", dlerror()); - return false; - } -#endif + return true; }