diff options
| author | David Robillard <d@drobilla.net> | 2006-07-14 03:43:32 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-14 03:43:32 +0000 |
| commit | 50a3102b9b533d7f8786d220f8df67421b9227c8 (patch) | |
| tree | 669f84631ba1d9a1d312e3f76b226ca938c75c0f /libs/ardour/control_protocol_manager.cc | |
| parent | edd841895b873b14c4aa814a80de5dc20ff30618 (diff) | |
Merge big changes (mostly Controllable) from trunk
git-svn-id: svn://localhost/ardour2/branches/midi@682 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/control_protocol_manager.cc')
| -rw-r--r-- | libs/ardour/control_protocol_manager.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index c2fb188953..0370886a35 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -49,6 +49,10 @@ ControlProtocolManager::set_session (Session& s) if ((*i)->requested || (*i)->mandatory) { instantiate (**i); (*i)->requested = false; + + if ((*i)->state) { + (*i)->protocol->set_state (*(*i)->state); + } } } } @@ -181,6 +185,7 @@ ControlProtocolManager::control_protocol_discover (string path) cpi->protocol = 0; cpi->requested = false; cpi->mandatory = descriptor->mandatory; + cpi->state = 0; control_protocol_info.push_back (cpi); |