From d4aa2f37b9509f16409abee2c54b44c4e71589d1 Mon Sep 17 00:00:00 2001 From: derselbst Date: Fri, 21 Jun 2024 09:34:05 +0200 Subject: [PATCH 1/4] Fix mixed declaration --- src/synth/fluid_synth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c index fb868a67d..ccd7836b4 100644 --- a/src/synth/fluid_synth.c +++ b/src/synth/fluid_synth.c @@ -1827,11 +1827,11 @@ fluid_synth_cc_LOCAL(fluid_synth_t *synth, int channum, int num) if(nrpn_select < GEN_LAST) { + float val = fluid_gen_scale_nrpn(nrpn_select, data); if(synth->verbose) { - FLUID_LOG(FLUID_INFO, "NRPN\t%d\t%d\t%d", channum, nrpn_select, data); + FLUID_LOG(FLUID_INFO, "NRPN\t%d\t%d\t%d\t%f", channum, nrpn_select, data, val); } - float val = fluid_gen_scale_nrpn(nrpn_select, data); fluid_synth_set_gen_LOCAL(synth, channum, nrpn_select, val); } From 7d464de801ec232f3002bbf71c2712fba259b095 Mon Sep 17 00:00:00 2001 From: derselbst Date: Mon, 24 Jun 2024 11:11:31 +0200 Subject: [PATCH 2/4] Fix linkage against gobject --- cmake_admin/FindGLib2.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake_admin/FindGLib2.cmake b/cmake_admin/FindGLib2.cmake index f6fa6f183..90379e4a6 100644 --- a/cmake_admin/FindGLib2.cmake +++ b/cmake_admin/FindGLib2.cmake @@ -35,7 +35,7 @@ find_package(PkgConfig QUIET) pkg_check_modules(PC_GLIB2 QUIET glib-2.0) pkg_check_modules(PC_GTHREAD2 QUIET gthread-2.0) pkg_check_modules(PC_GMODULE2 QUIET gmodule-2.0) -pkg_check_modules(PC_GMODULE2 QUIET gobject-2.0) +pkg_check_modules(PC_GOBJECT2 QUIET gobject-2.0) # Find the headers and libraries find_path( @@ -209,7 +209,7 @@ if(GLib2_gobject-2_LIBRARY AND NOT TARGET GLib2::gobject-2) # Handle transitive dependencies if(PC_GOBJECT2_FOUND) get_target_properties_from_pkg_config("${GLib2_gobject-2_LIBRARY}" - "PC_OBJECT2" "_gobject2") + "PC_GOBJECT2" "_gobject2") else() find_package(libffi QUIET) set(_gobject2_link_libraries "libffi" "GLib2::glib-2") From 80cef3fc928fb4074ea1be2b6cc96631b7461d3a Mon Sep 17 00:00:00 2001 From: derselbst Date: Tue, 25 Jun 2024 23:54:07 +0200 Subject: [PATCH 3/4] Fix a few compiler warnings --- src/sfloader/fluid_defsfont.c | 2 +- src/sfloader/fluid_sfont.c | 4 ++-- src/synth/fluid_event.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sfloader/fluid_defsfont.c b/src/sfloader/fluid_defsfont.c index 129867d0f..84eaefce2 100644 --- a/src/sfloader/fluid_defsfont.c +++ b/src/sfloader/fluid_defsfont.c @@ -1746,7 +1746,7 @@ fluid_preset_zone_get_inst(fluid_preset_zone_t *zone) * new_fluid_inst */ fluid_inst_t * -new_fluid_inst() +new_fluid_inst(void) { fluid_inst_t *inst = FLUID_NEW(fluid_inst_t); diff --git a/src/sfloader/fluid_sfont.c b/src/sfloader/fluid_sfont.c index 00423c003..cad6f18da 100644 --- a/src/sfloader/fluid_sfont.c +++ b/src/sfloader/fluid_sfont.c @@ -497,7 +497,7 @@ void delete_fluid_preset(fluid_preset_t *preset) * @return The sample on success, NULL otherwise. */ fluid_sample_t * -new_fluid_sample() +new_fluid_sample(void) { fluid_sample_t *sample = NULL; @@ -544,7 +544,7 @@ delete_fluid_sample(fluid_sample_t *sample) * * @warning Do NOT allocate samples on the stack and assign them to a voice! */ -size_t fluid_sample_sizeof() +size_t fluid_sample_sizeof(void) { return sizeof(fluid_sample_t); } diff --git a/src/synth/fluid_event.c b/src/synth/fluid_event.c index 48b781bd7..88adb77b1 100644 --- a/src/synth/fluid_event.c +++ b/src/synth/fluid_event.c @@ -56,7 +56,7 @@ fluid_event_clear(fluid_event_t *evt) * @return New sequencer event structure or NULL if out of memory */ fluid_event_t * -new_fluid_event() +new_fluid_event(void) { fluid_event_t *evt; From 91b86d8bbdf922eda764c41c6325d8150485a368 Mon Sep 17 00:00:00 2001 From: Tom M Date: Wed, 26 Jun 2024 11:09:03 +0200 Subject: [PATCH 4/4] Update docs about XG bank selection logic --- doc/fluidsettings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/fluidsettings.xml b/doc/fluidsettings.xml index 71af6432f..ef02b55bc 100644 --- a/doc/fluidsettings.xml +++ b/doc/fluidsettings.xml @@ -179,8 +179,8 @@ Developers:
  • gs: (default) CC0 becomes the bank number, CC32 is ignored.
  • gm: ignores CC0 and CC32 messages.
    • -
  • xg: if CC0<120 then channel is set to melodic and CC32 is the bank number. If CC0>=120 then channel is set to drum and the bank number is set to 128 (CC32 is ignored).
  • mma: bank is calculated as CC0*128+CC32.
    • +
  • xg: If CC0 is equal to 120, 126, or 127 then channel is set to drum and the bank number is set to 128 (CC32 is ignored). Otherwise the channel is set to melodic and CC32 is the bank number. Note that you need fluidsynth >=2.3.5 for this to work correctly, previous versions behaved incorrectly.