diff options
| -rw-r--r-- | libs/surfaces/generic_midi/midicontrollable.cc | 17 | ||||
| -rw-r--r-- | libs/surfaces/generic_midi/midicontrollable.h | 1 |
2 files changed, 17 insertions, 1 deletions
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc index bae3201072..226502f0ae 100644 --- a/libs/surfaces/generic_midi/midicontrollable.cc +++ b/libs/surfaces/generic_midi/midicontrollable.cc @@ -48,6 +48,7 @@ MIDIControllable::MIDIControllable (Port& p, bool m) _learned = false; /* from URI */ setting = false; last_value = 0; // got a better idea ? + last_controllable_value = 0.0f; control_type = none; _control_description = "MIDI Control: none"; control_additional = (byte) -1; @@ -63,6 +64,7 @@ MIDIControllable::MIDIControllable (Port& p, Controllable& c, bool m) _learned = true; /* from controllable */ setting = false; last_value = 0; // got a better idea ? + last_controllable_value = 0.0f; control_type = none; _control_description = "MIDI Control: none"; control_additional = (byte) -1; @@ -217,7 +219,20 @@ MIDIControllable::midi_sense_controller (Parser &, EventTwoBytes *msg) if (control_additional == msg->controller_number) { if (!controllable->is_toggle()) { - controllable->set_value (midi_to_control (msg->value)); + float new_value = msg->value; + float max_value = max(last_controllable_value, new_value); + float min_value = min(last_controllable_value, new_value); + float range = max_value - min_value; + float threshold = 10; + + // prevent jumps when MIDI controller and controllable are "out of sync" + if (range < threshold && + controllable->get_value() <= midi_to_control(max_value) && + controllable->get_value() >= midi_to_control(min_value)) { + controllable->set_value (midi_to_control (new_value) ); + } + + last_controllable_value = new_value; } else { if (msg->value > 64.0f) { controllable->set_value (1); diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h index 2e70e98a75..5f188d1688 100644 --- a/libs/surfaces/generic_midi/midicontrollable.h +++ b/libs/surfaces/generic_midi/midicontrollable.h @@ -95,6 +95,7 @@ class MIDIControllable : public PBD::Stateful MIDI::Port& _port; bool setting; MIDI::byte last_value; + float last_controllable_value; bool _momentary; bool _is_gain_controller; bool _learned; |