Merge branch 'release/2.3' into master

FluidSynth · Jun 26, 2024 · 84c01f8 · 84c01f8
2 parents 231b690 + 91b86d8
commit 84c01f8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git 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")

diff --git a/doc/fluidsettings.xml b/doc/fluidsettings.xml
@@ -180,8 +180,8 @@ Developers:
                 <ul>
                     <li>gs: (default) CC0 becomes the bank number, CC32 is ignored.</li>
                     <li>gm: ignores CC0 and CC32 messages.</li>
-                    <li>xg: if CC0&lt;120 then channel is set to melodic and CC32 is the bank number. If CC0&gt;=120 then channel is set to drum and the bank number is set to 128 (CC32 is ignored).</li>
                     <li>mma: bank is calculated as CC0*128+CC32.</li>
+                    <li>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 &gt;=2.3.5 for this to work correctly, previous versions behaved incorrectly.</li>
                 </ul>
             </desc>
         </setting>

diff --git 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
@@ -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
@@ -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;
 

diff --git 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);
                 }