diff options
author | Robin Gareus <robin@gareus.org> | 2018-10-04 02:30:21 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2018-10-04 02:30:21 +0200 |
commit | b6b353d4528bbb7f352f9947015a3b7168825a9c (patch) | |
tree | 21d5f6a3fe04c18ee26165e3d2f4fdb53e1c41b3 /libs/surfaces/generic_midi | |
parent | 9df6e334fc01ce024702c51e84a80193bea36bff (diff) |
Handle generic-midi bindings per session.
This allows to special-cases session-specific control-surface state.
e.g. midi-learn.
Only restore midi-learned, session-specific, bindings when loading a
session with generic-midi enabled.
Also dis/re-enable generic-midi resets midi-learned, but no other
session-independent settings.
This also handles the edge case:
1) load global config, generic-midi = ON, w/ bindings.
state is remembered as cpi->state
2) load session-condig, generic-midi = OFF, cpi->state is retained
3) user enables the surface, cpi->state from (1) is applied.
-> invalid bindings applied -> fail
Diffstat (limited to 'libs/surfaces/generic_midi')
-rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index 4d931b8fe0..214c9fede7 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -669,7 +669,10 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version) * <Controls><MidiControllable>...</MidiControllable><Controls> section */ - { + bool load_dynamic_bindings = false; + node.get_property ("session-state", load_dynamic_bindings); + + if (load_dynamic_bindings) { Glib::Threads::Mutex::Lock lm2 (controllables_lock); nlist = node.children(); // "Controls" |