smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-13 01:56:34 +01:00
Code Issues Projects Releases Wiki Activity

semantically more correct ordering of previous commit

Browse source
This commit is contained in:
Paul Davis 2017-06-10 12:04:27 -04:00
parent 0f20819c86
commit ae837b49ed
1 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libs/ardour/control_protocol_manager.cc
View file

@ -87,11 +87,19 @@ ControlProtocolManager::set_session (Session* s)
{ {
SessionHandlePtr::set_session (s); SessionHandlePtr::set_session (s);
if (_session) { if (!_session) {
return;
}
/* get selection info and set it before instantiating any {
* control protocols. Glib::Threads::RWLock::ReaderLock lm (protocols_lock);
*/
for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
if ((*i)->requested || (*i)->mandatory) {
(void) activate (**i);
}
}
}
CoreSelection::StripableAutomationControls sac; CoreSelection::StripableAutomationControls sac;
_session->selection().get_stripables (sac); _session->selection().get_stripables (sac);
@ -107,15 +115,6 @@ ControlProtocolManager::set_session (Session* s)
StripableSelectionChanged (v); /* EMIT SIGNAL */ StripableSelectionChanged (v); /* EMIT SIGNAL */
} }
} }
Glib::Threads::RWLock::ReaderLock lm (protocols_lock);
for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
if ((*i)->requested || (*i)->mandatory) {
(void) activate (**i);
}
}
}
} }
int int