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

Compare commits

base: e1lama:cea6f547d2e5f90fcbf8ad9e4b551f28302f78b8
Branches Tags
e1lama:master e1lama:revert-110-master e1lama:cocoapods-update e1lama:arielelkin-patch-1 e1lama:releases
e1lama:5.0.1 e1lama:5.0.0 e1lama:4.6.2 e1lama:4.6.1 e1lama:v4.6.0 e1lama:4.5.1 e1lama:4.5.0 e1lama:4.4.4 e1lama:4.4.3 e1lama:4.4.2 e1lama:4.4.1 e1lama:4.4.0 e1lama:4.3.1 e1lama:4.3.0 e1lama:4.2.1 e1lama:4.2.0 e1lama:4.1.3 e1lama:4.1.2 e1lama:4.1.1 e1lama:4.1 e1lama:4.0 e1lama:3.2 e1lama:3.1 e1lama:3.0 e1lama:2.02 e1lama:2.01 e1lama:0.99
...
compare: e1lama:d7d6079f6bed7090612e9243c4a6311cfdada4de
Branches Tags
e1lama:master e1lama:revert-110-master e1lama:cocoapods-update e1lama:arielelkin-patch-1 e1lama:releases
e1lama:5.0.1 e1lama:5.0.0 e1lama:4.6.2 e1lama:4.6.1 e1lama:v4.6.0 e1lama:4.5.1 e1lama:4.5.0 e1lama:4.4.4 e1lama:4.4.3 e1lama:4.4.2 e1lama:4.4.1 e1lama:4.4.0 e1lama:4.3.1 e1lama:4.3.0 e1lama:4.2.1 e1lama:4.2.0 e1lama:4.1.3 e1lama:4.1.2 e1lama:4.1.1 e1lama:4.1 e1lama:4.0 e1lama:3.2 e1lama:3.1 e1lama:3.0 e1lama:2.02 e1lama:2.01 e1lama:0.99

2 Commits
cea6f547d2 ... d7d6079f6b

Author SHA1 Message Date
garyscavone
d7d6079f6b Merge pull request #144 from zonkmachine/modalbarcontrol 
Fix mixed up control messages
 2024-12-09 10:18:26 -05:00
Oskar Wallgren
aeaef391ef Fix mixed up control messages 
In ModalBar.cpp the control messages for 'Stick direct mix' and 'Vibrato amplitude'
have been mixed up. This also concerns some documentation but the description
on https://ccrma.stanford.edu/software/stk/classstk_1_1ModalBar.html, which is
generated from the source, is correct.
 2023-10-06 16:39:01 +02:00
1 changed files with 4 additions and 4 deletions
Expand all files Collapse all files

8
src/ModalBar.cpp
View File

@@ -9,9 +9,9 @@
Control Change Numbers: Control Change Numbers:
- Stick Hardness = 2 - Stick Hardness = 2
- Stick Position = 4 - Stick Position = 4
- Vibrato Gain = 8 - Vibrato Gain = 1
- Vibrato Frequency = 11 - Vibrato Frequency = 11
- Direct Stick Mix = 1 - Direct Stick Mix = 8
- Volume = 128 - Volume = 128
- Modal Presets = 16 - Modal Presets = 16
- Marimba = 0 - Marimba = 0
@@ -173,9 +173,9 @@ void ModalBar :: controlChange( int number, StkFloat value )
else if (number == __SK_ProphesyRibbon_) // 16 else if (number == __SK_ProphesyRibbon_) // 16
this->setPreset((int) value); this->setPreset((int) value);
else if (number == __SK_Balance_) // 8 else if (number == __SK_Balance_) // 8
vibratoGain_ = normalizedValue * 0.3;
else if (number == __SK_ModWheel_) // 1
directGain_ = normalizedValue; directGain_ = normalizedValue;
else if (number == __SK_ModWheel_) // 1
vibratoGain_ = normalizedValue * 0.3;
else if (number == __SK_ModFrequency_) // 11 else if (number == __SK_ModFrequency_) // 11
vibrato_.setFrequency( normalizedValue * 12.0 ); vibrato_.setFrequency( normalizedValue * 12.0 );
else if (number == __SK_AfterTouch_Cont_) // 128 else if (number == __SK_AfterTouch_Cont_) // 128