From aeaef391efa0737a108dbf52f9b316a26bac75c6 Mon Sep 17 00:00:00 2001 From: Oskar Wallgren Date: Fri, 6 Oct 2023 16:23:45 +0200 Subject: [PATCH] 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. --- src/ModalBar.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ModalBar.cpp b/src/ModalBar.cpp index 0d5f77f..ded057f 100644 --- a/src/ModalBar.cpp +++ b/src/ModalBar.cpp @@ -9,9 +9,9 @@ Control Change Numbers: - Stick Hardness = 2 - Stick Position = 4 - - Vibrato Gain = 8 + - Vibrato Gain = 1 - Vibrato Frequency = 11 - - Direct Stick Mix = 1 + - Direct Stick Mix = 8 - Volume = 128 - Modal Presets = 16 - Marimba = 0 @@ -173,9 +173,9 @@ void ModalBar :: controlChange( int number, StkFloat value ) else if (number == __SK_ProphesyRibbon_) // 16 this->setPreset((int) value); else if (number == __SK_Balance_) // 8 - vibratoGain_ = normalizedValue * 0.3; - else if (number == __SK_ModWheel_) // 1 directGain_ = normalizedValue; + else if (number == __SK_ModWheel_) // 1 + vibratoGain_ = normalizedValue * 0.3; else if (number == __SK_ModFrequency_) // 11 vibrato_.setFrequency( normalizedValue * 12.0 ); else if (number == __SK_AfterTouch_Cont_) // 128