diff options
Diffstat (limited to 'apps/plugins/midi/sequencer.c')
-rw-r--r-- | apps/plugins/midi/sequencer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/plugins/midi/sequencer.c b/apps/plugins/midi/sequencer.c index e860dbd2dd..d35a057c32 100644 --- a/apps/plugins/midi/sequencer.c +++ b/apps/plugins/midi/sequencer.c | |||
@@ -148,12 +148,12 @@ static void findDelta(struct SynthObject * so, int ch, int note) | |||
148 | 148 | ||
149 | /* | 149 | /* |
150 | Old formula: | 150 | Old formula: |
151 | delta = (((gustable[note+chPBNoteOffset[ch]]<<FRACTSIZE) / (wf->rootFreq)) * wf->sampRate / (SAMPLE_RATE)); | 151 | delta = (((freqtable[note+chPBNoteOffset[ch]]<<FRACTSIZE) / (wf->rootFreq)) * wf->sampRate / (SAMPLE_RATE)); |
152 | 152 | ||
153 | Plus some pitch stuff. See old SVN for how it used to be | 153 | Plus some pitch stuff. See old SVN for how it used to be |
154 | */ | 154 | */ |
155 | 155 | ||
156 | delta = (((gustable[note+chPBNoteOffset[ch]]))); /* anywhere from 8000 to 8000000 */ | 156 | delta = (((freqtable[note+chPBNoteOffset[ch]]))); /* anywhere from 8000 to 8000000 */ |
157 | delta = delta * wf->sampRate; /* approx 20000 - 44000 but can vary with tuning */ | 157 | delta = delta * wf->sampRate; /* approx 20000 - 44000 but can vary with tuning */ |
158 | delta = (delta * chPBFractBend[ch]); /* approx 60000 - 70000 */ | 158 | delta = (delta * chPBFractBend[ch]); /* approx 60000 - 70000 */ |
159 | delta = delta / (SAMPLE_RATE); /* 44100 or 22050 */ | 159 | delta = delta / (SAMPLE_RATE); /* 44100 or 22050 */ |
@@ -263,7 +263,7 @@ static inline void pressNote(int ch, int note, int vol) | |||
263 | 263 | ||
264 | struct GWaveform * wf = drumSet[note]->waveforms[0]; | 264 | struct GWaveform * wf = drumSet[note]->waveforms[0]; |
265 | voices[a].wf = wf; | 265 | voices[a].wf = wf; |
266 | voices[a].delta = (((gustable[note]<<FRACTSIZE) / wf->rootFreq) * wf->sampRate / SAMPLE_RATE); | 266 | voices[a].delta = (((freqtable[note]<<FRACTSIZE) / wf->rootFreq) * wf->sampRate / SAMPLE_RATE); |
267 | if (wf->mode & 28) | 267 | if (wf->mode & 28) |
268 | // midi_debug("\nWoah, a drum patch has a loop. Stripping the loop..."); | 268 | // midi_debug("\nWoah, a drum patch has a loop. Stripping the loop..."); |
269 | wf->mode = wf->mode & (255-28); | 269 | wf->mode = wf->mode & (255-28); |