e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-04-19 22:16:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

FMVoices bug fix to avoid currentVowel > 31.

Browse Source
This commit is contained in:
Gary Scavone
2017-05-03 15:20:19 -04:00
parent 56bcdc32ed
commit 9966f06757
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/FMVoices.cpp
View File

@@ -98,10 +98,11 @@ void FMVoices :: setFrequency( StkFloat frequency )
i = currentVowel_ - 64; i = currentVowel_ - 64;
temp2 = 1.1; temp2 = 1.1;
} }
else if (currentVowel_ <= 128) { else if (currentVowel_ < 128) {
i = currentVowel_ - 96; i = currentVowel_ - 96;
temp2 = 1.2; temp2 = 1.2;
} }
else return;
baseFrequency_ = frequency; baseFrequency_ = frequency;
temp = (temp2 * Phonemes::formantFrequency(i, 0) / baseFrequency_) + 0.5; temp = (temp2 * Phonemes::formantFrequency(i, 0) / baseFrequency_) + 0.5;
@@ -140,7 +141,7 @@ void FMVoices :: controlChange( int number, StkFloat value )
if (number == __SK_Breath_) // 2 if (number == __SK_Breath_) // 2
gains_[3] = fmGains_[(int) ( normalizedValue * 99.9 )]; gains_[3] = fmGains_[(int) ( normalizedValue * 99.9 )];
else if (number == __SK_FootControl_) { // 4 else if (number == __SK_FootControl_) { // 4
currentVowel_ = (int) (normalizedValue * 128.0); currentVowel_ = (int) (normalizedValue * 127.0);
this->setFrequency(baseFrequency_); this->setFrequency(baseFrequency_);
} }
else if (number == __SK_ModFrequency_) // 11 else if (number == __SK_ModFrequency_) // 11