Merge branch 'master' into dsp-cpp

FluidSynth · Jan 12, 2025 · 9e08718 · 9e08718
2 parents fe98e60 + e57360d
commit 9e08718
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/synth/fluid_voice.c b/src/synth/fluid_voice.c
@@ -1399,14 +1399,12 @@ fluid_voice_kill_excl(fluid_voice_t *voice)
     fluid_voice_gen_set(voice, GEN_EXCLUSIVECLASS, 0);
 
     /* Speed up the volume envelope */
-    /* The value was found through listening tests with hi-hat samples. */
-    fluid_voice_gen_set(voice, GEN_VOLENVRELEASE, -200);
+    /* The previously-used value of "-200" was found through listening tests
+       with hi-hat samples. This was changed to "-2000" after "-200" was shown
+       to cause too long cut times in most cases. */
+    fluid_voice_gen_set(voice, GEN_VOLENVRELEASE, -2000);
     fluid_voice_update_param(voice, GEN_VOLENVRELEASE);
 
-    /* Speed up the modulation envelope */
-    fluid_voice_gen_set(voice, GEN_MODENVRELEASE, -200);
-    fluid_voice_update_param(voice, GEN_MODENVRELEASE);
-
     at_tick = fluid_channel_get_min_note_length_ticks(voice->channel);
     UPDATE_RVOICE_I1(fluid_rvoice_noteoff, at_tick);
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -186,7 +186,12 @@ else()
 
     add_custom_target(renderExcl
         COMMAND fluidsynth -R 0 -C 0 -g 1.4 -F "${EXCL_RENDER_DIR}/exclusive class cutoff speed.${FEXT}" "exclusive class cutoff speed.mid" "exclusive class cutoff speed.sf2"
-        COMMENT "Rendering Christian Collins' exclusive class cutoff test"
+        COMMAND fluidsynth -R 0 -C 0 -g 1.4 -F "${EXCL_RENDER_DIR}/MIDInotecut.${FEXT}" "MIDInotecut.mid" ${GENERAL_USER_GS2}
+        COMMAND fluidsynth -R 0 -C 0 -g 1.4 -F "${EXCL_RENDER_DIR}/percussion note cutoff.${FEXT}" "percussion note cutoff.mid" ${GENERAL_USER_GS2}
+        COMMAND fluidsynth -R 0 -C 0 -g 1.4 -F "${EXCL_RENDER_DIR}/percussion-test.${FEXT}" "percussion-test.mid" ${GENERAL_USER_GS2}
+        COMMAND fluidsynth -R 0 -C 0 -g 0.6 -F "${EXCL_RENDER_DIR}/e1m1_GeneralUser2.${FEXT}" "e1m1.mid" ${GENERAL_USER_GS2}
+        COMMAND fluidsynth -R 0 -C 0 -g 0.6 -F "${EXCL_RENDER_DIR}/e1m1_gzdoom.${FEXT}" "e1m1.mid" "../sf2/gzdoom.sf2"
+        COMMENT "Rendering exclusive class cutoff tests"
         DEPENDS fluidsynth create_iir_dir
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/manual/exclusive_class/
         VERBATIM

diff --git a/test/manual b/test/manual
+ −		exclusive_class/MIDInotecut.mid
+ −		exclusive_class/MIDInotecut_MSGS.mp3
+ −		exclusive_class/e1m1.mid
+ −		exclusive_class/exclusive class cutoff speed fluidsynth 2.4.3+.wav
+ −		exclusive_class/exclusive class cutoff speed fluidsynth <=2.4.2.wav
+ −		exclusive_class/percussion note cutoff-SC8820.ogg
+ −		exclusive_class/percussion note cutoff.mid
+ −		exclusive_class/percussion-test-SC-55.flac
+ −		exclusive_class/percussion-test.mid
+ −		sf2/gzdoom.sf2