summaryrefslogtreecommitdiff
path: root/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
diff options
context:
space:
mode:
Diffstat (limited to 'libs/surfaces/generic_midi/generic_midi_control_protocol.cc')
-rw-r--r--libs/surfaces/generic_midi/generic_midi_control_protocol.cc15
1 files changed, 12 insertions, 3 deletions
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index e171cfbcc3..0ed6a90942 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -772,7 +772,7 @@ GenericMidiControlProtocol::create_binding (const XMLNode& node)
MIDI::eventType ev;
int intval;
bool momentary;
- bool encoder = false;
+ MIDIControllable::Encoder encoder = MIDIControllable::No_enc;
if ((prop = node.property (X_("ctl"))) != 0) {
ev = MIDI::controller;
@@ -782,8 +782,17 @@ GenericMidiControlProtocol::create_binding (const XMLNode& node)
ev = MIDI::program;
} else if ((prop = node.property (X_("pb"))) != 0) {
ev = MIDI::pitchbend;
- } else if ((prop = node.property (X_("enc"))) != 0) {
- encoder = true;
+ } else if ((prop = node.property (X_("enc-l"))) != 0) {
+ encoder = MIDIControllable::Enc_L;
+ ev = MIDI::controller;
+ } else if ((prop = node.property (X_("enc-r"))) != 0) {
+ encoder = MIDIControllable::Enc_R;
+ ev = MIDI::controller;
+ } else if ((prop = node.property (X_("enc-2"))) != 0) {
+ encoder = MIDIControllable::Enc_2;
+ ev = MIDI::controller;
+ } else if ((prop = node.property (X_("enc-b"))) != 0) {
+ encoder = MIDIControllable::Enc_B;
ev = MIDI::controller;
} else {
return 0;