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/ardour/session_state.cc | |
| 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/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 1335c554cb..0c974fcc84 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1729,7 +1729,7 @@ Session::set_state (const XMLNode& node, int version) } if ((child = find_named_node (node, ControlProtocolManager::state_node_name)) != 0) { - ControlProtocolManager::instance().set_state (*child, version); + ControlProtocolManager::instance().set_state (*child, 1 /* here: session-specific state */); } if ((child = find_named_node (node, "Script"))) { |