summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-07-23 13:31:51 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-07-23 13:31:51 +0000
commitb2bbc44eaac337a13dfb92449635924572f60953 (patch)
treefae7c21d4d538f4596512218ebd1e140313ff733 /libs
parent0f79645be79584e6670c1b4e053dcdb8083cae0e (diff)
forward-port generic MIDI and transport controllable changes from 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@13066 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/surfaces/generic_midi/midicontrollable.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
index 4be5e25b92..96d2c1772c 100644
--- a/libs/surfaces/generic_midi/midicontrollable.cc
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -234,7 +234,9 @@ MIDIControllable::midi_sense_note (Parser &, EventTwoBytes *msg, bool /*is_on*/)
}
if (!controllable->is_toggle()) {
- controllable->set_value (midi_to_control (msg->note_number));
+ if (control_additional == msg->note_number) {
+ controllable->set_value (midi_to_control (msg->velocity));
+ }
} else {
if (control_additional == msg->note_number) {
controllable->set_value (controllable->get_value() > 0.5f ? 0.0f : 1.0f);