Re-add note_off_fast, gain ~2% MIDI boost

earlephilhower · earlephilhower · commit 262145d58220 · 2025-10-22T21:55:09.000-07:00
diff --git a/lib/TinySoundFont b/lib/TinySoundFont
@@ -1 +1 @@
-Subproject commit e2b7b62c8ba1b368aa6f5c64bc8a7b4a2286604a
+Subproject commit d53bdd3f9d2958134c9ced60b47c88ee37837df4
diff --git a/src/AudioGeneratorMIDI.cpp b/src/AudioGeneratorMIDI.cpp
@@ -440,7 +440,7 @@ int AudioGeneratorMIDI::PlayMIDI() {
                 for (tgnum = 0; tgnum < num_tonegens; ++tgnum) {    /* find which generator is playing it */
                     tg = &tonegen[tgnum];
                     if (tg->playing && tg->track == tracknum && tg->note == trk->note) {
-                        tsf_note_off/*_fast*/(g_tsf, tg->instrument, tg->note);//, tg->playIndex);
+                        tsf_note_off_fast(g_tsf, tg->instrument, tg->note, tg->playIndex);
                         tg->playing = false;
                         tg->playIndex = -1;
                         trk->tonegens[tgnum] = false;
diff --git a/src/libtinysoundfont/tsf.h b/src/libtinysoundfont/tsf.h
@@ -2052,11 +2052,11 @@ TSFDEF int tsf_note_on(tsf* f, int preset_index, int key, float vel)
 		tsf_voice_lfo_setup(&voice->modlfo, region->delayModLFO, region->freqModLFO, f->outSampleRate);
 		tsf_voice_lfo_setup(&voice->viblfo, region->delayVibLFO, region->freqVibLFO, f->outSampleRate);
 	}
-//#ifndef TSF_SAMPLES_SHORT
+#ifndef TSF_SAMPLES_SHORT
 	return 1;
-//#else
-//        return voicePlayIndex + 1;
-//#endif
+#else
+        return voicePlayIndex + 1;
+#endif
 }
 
 TSFDEF int tsf_bank_note_on(tsf* f, int bank, int preset_number, int key, float vel)
@@ -2086,12 +2086,10 @@ TSFDEF void tsf_note_off(tsf* f, int preset_index, int key)
 	}
 }
 
-#if 0
-// Less than 0.5% speed difference seen w/fast
 /**
  * Stops all voices with the given playing index. If no key provided or if -1, fallbacks to tsf_note_off
  */
-TSFDEF void tsf_note_off_fast(tsf* f, int preset_index, int key, int playIndex = -1)
+TSFDEF void tsf_note_off_fast(tsf* f, int preset_index, int key, int playIndex)
 {
   if (playIndex < 0) {
       tsf_note_off(f, preset_index, key);
@@ -2104,7 +2102,6 @@ TSFDEF void tsf_note_off_fast(tsf* f, int preset_index, int key, int playIndex =
       }
   }
 }
-#endif
 
 TSFDEF int tsf_bank_note_off(tsf* f, int bank, int preset_number, int key)
 {

Original file line number	Diff line number	Diff line change
`@@ -2052,11 +2052,11 @@ TSFDEF int tsf_note_on(tsf* f, int preset_index, int key, float vel)`
`2052`	`2052`	`tsf_voice_lfo_setup(&voice->modlfo, region->delayModLFO, region->freqModLFO, f->outSampleRate);`
`2053`	`2053`	`tsf_voice_lfo_setup(&voice->viblfo, region->delayVibLFO, region->freqVibLFO, f->outSampleRate);`
`2054`	`2054`	`}`
`2055`		`-//#ifndef TSF_SAMPLES_SHORT`
	`2055`	`+#ifndef TSF_SAMPLES_SHORT`
`2056`	`2056`	`return 1;`
`2057`		`-//#else`
`2058`		`-// return voicePlayIndex + 1;`
`2059`		`-//#endif`
	`2057`	`+#else`
	`2058`	`+ return voicePlayIndex + 1;`
	`2059`	`+#endif`
`2060`	`2060`	`}`
`2061`	`2061`
`2062`	`2062`	`TSFDEF int tsf_bank_note_on(tsf* f, int bank, int preset_number, int key, float vel)`
`@@ -2086,12 +2086,10 @@ TSFDEF void tsf_note_off(tsf* f, int preset_index, int key)`
`2086`	`2086`	`}`
`2087`	`2087`	`}`
`2088`	`2088`
`2089`		`-#if 0`
`2090`		`-// Less than 0.5% speed difference seen w/fast`
`2091`	`2089`	`/**`
`2092`	`2090`	`* Stops all voices with the given playing index. If no key provided or if -1, fallbacks to tsf_note_off`
`2093`	`2091`	`*/`
`2094`		`-TSFDEF void tsf_note_off_fast(tsf* f, int preset_index, int key, int playIndex = -1)`
	`2092`	`+TSFDEF void tsf_note_off_fast(tsf* f, int preset_index, int key, int playIndex)`
`2095`	`2093`	`{`
`2096`	`2094`	`if (playIndex < 0) {`
`2097`	`2095`	`tsf_note_off(f, preset_index, key);`
`@@ -2104,7 +2102,6 @@ TSFDEF void tsf_note_off_fast(tsf* f, int preset_index, int key, int playIndex =`
`2104`	`2102`	`}`
`2105`	`2103`	`}`
`2106`	`2104`	`}`
`2107`		`-#endif`
`2108`	`2105`
`2109`	`2106`	`TSFDEF int tsf_bank_note_off(tsf* f, int bank, int preset_number, int key)`
`2110`	`2107`	`{`