diff options
| author | Len Ovens <len@ovenwerks.net> | 2015-07-24 17:34:22 -0700 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-07-27 16:17:38 -0400 |
| commit | 8b4a237ee359dea9038daacc6e9b620d68431263 (patch) | |
| tree | 7431358036b7b12391c4a795c1bc27d2cbfb84e5 /libs/surfaces/generic_midi/generic_midi_control_protocol.cc | |
| parent | 938f365cc14de448d177f438df4d0de76190cf16 (diff) | |
Handle the 4 common encoder types.
Diffstat (limited to 'libs/surfaces/generic_midi/generic_midi_control_protocol.cc')
| -rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 15 |
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; |