aboutsummaryrefslogtreecommitdiff
path: root/src/adlmidi_private.hpp
diff options
context:
space:
mode:
authorVitaly Novichkov <admin@wohlnet.ru>2018-05-14 03:45:19 +0300
committerVitaly Novichkov <admin@wohlnet.ru>2018-05-14 03:45:19 +0300
commit372f2c17e15e846def959f34f67c61f679ee7bc4 (patch)
tree4c1014f3853edbff1af2d2992d66477be0b00f0f /src/adlmidi_private.hpp
parent802e07b3c276d1e535556146c9201dea29051e3e (diff)
parent74929e3fb33926cfe29fa607726cbd3fec8abaae (diff)
downloadlibADLMIDI-372f2c17e15e846def959f34f67c61f679ee7bc4.tar.gz
libADLMIDI-372f2c17e15e846def959f34f67c61f679ee7bc4.tar.bz2
libADLMIDI-372f2c17e15e846def959f34f67c61f679ee7bc4.zip
Merge branch 'master' of github.com:Wohlstand/libADLMIDI
Diffstat (limited to 'src/adlmidi_private.hpp')
-rw-r--r--src/adlmidi_private.hpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp
index d66daf4..65cb4bc 100644
--- a/src/adlmidi_private.hpp
+++ b/src/adlmidi_private.hpp
@@ -617,6 +617,7 @@ public:
uint8_t panning, vibrato, sustain;
char ____padding[6];
double bend, bendsense;
+ int bendsense_lsb, bendsense_msb;
double vibpos, vibspeed, vibdepth;
int64_t vibdelay;
uint8_t lastlrpn, lastmrpn;
@@ -809,7 +810,9 @@ public:
void resetAllControllers()
{
bend = 0.0;
- bendsense = 2 / 8192.0;
+ bendsense_msb = 2;
+ bendsense_lsb = 0;
+ updateBendSensitivity();
volume = 100;
expression = 127;
sustain = 0;
@@ -821,6 +824,11 @@ public:
portamento = 0;
brightness = 127;
}
+ void updateBendSensitivity()
+ {
+ int cent = bendsense_msb * 100 + bendsense_lsb;
+ bendsense = cent * (0.01 / 8192.0);
+ }
MIDIchannel()
{
activenotes_clear();