Merge remote-tracking branch 'origin/release/2.3' into master

FluidSynth · Jun 15, 2024 · 231b690 · 231b690
2 parents f9bde41 + c189075
commit 231b690
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/doc/fluidsettings.xml b/doc/fluidsettings.xml
@@ -112,7 +112,7 @@ Developers:
             <max>127</max>
             <realtime/>
             <desc>
-                Device identifier used for SYSEX commands, such as MIDI Tuning Standard commands. Fluidsynth will only process those SYSEX commands destined for this ID (except when this setting is set to 127, which causes fluidsynth to process all SYSEX commands, regardless of the device ID). Broadcast commands (with ID=127) will always be processed.</desc>
+                Device identifier used for SYSEX commands, such as MIDI Tuning Standard commands. Fluidsynth will only process those SYSEX commands destined for this ID (except when this setting is set to 127, which causes fluidsynth to process all SYSEX commands, regardless of the device ID). Broadcast commands (with ID=127) will always be processed. It has been observed that setting this ID to 16 provides best compatibility when playing MIDI files which contain SYSEX commands that you want to have honored.</desc>
         </setting>
         <setting>
             <name>dynamic-sample-loading</name>

diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
@@ -1827,6 +1827,10 @@ fluid_synth_cc_LOCAL(fluid_synth_t *synth, int channum, int num)
 
                 if(nrpn_select < GEN_LAST)
                 {
+                    if(synth->verbose)
+                    {
+                        FLUID_LOG(FLUID_INFO, "NRPN\t%d\t%d\t%d", channum, nrpn_select, data);
+                    }
                     float val = fluid_gen_scale_nrpn(nrpn_select, data);
                     fluid_synth_set_gen_LOCAL(synth, channum, nrpn_select, val);
                 }
@@ -2050,8 +2054,8 @@ fluid_synth_sysex(fluid_synth_t *synth, const char *data, int len,
                 || data[3] == MIDI_SYSEX_GM2_ON))
         {
             int result;
-            synth->bank_select = FLUID_BANK_STYLE_GM;
             fluid_synth_api_enter(synth);
+            synth->bank_select = FLUID_BANK_STYLE_GM;
             result = fluid_synth_system_reset_LOCAL(synth);
             FLUID_API_RETURN(result);
         }