ardour/livetrax
13
0
Fork 0
Code

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libs/ardour/control_protocol_manager.cc
View File

@ -87,27 +87,11 @@ ControlProtocolManager::set_session (Session* s)
{
SessionHandlePtr::set_session (s);
if (_session) {
/* get selection info and set it before instantiating any
* control protocols.
*/
CoreSelection::StripableAutomationControls sac;
_session->selection().get_stripables (sac);
if (!sac.empty()) {
StripableNotificationListPtr v (new StripableNotificationList);
for (CoreSelection::StripableAutomationControls::iterator i = sac.begin(); i != sac.end(); ++i) {
if ((*i).stripable) {
v->push_back (boost::weak_ptr<Stripable> ((*i).stripable));
}
}
if (!v->empty()) {
StripableSelectionChanged (v); /* EMIT SIGNAL */
}
}
if (!_session) {
return;
}
{
Glib::Threads::RWLock::ReaderLock lm (protocols_lock);
for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
@ -116,6 +100,21 @@ ControlProtocolManager::set_session (Session* s)
}
}
}
CoreSelection::StripableAutomationControls sac;
_session->selection().get_stripables (sac);
if (!sac.empty()) {
StripableNotificationListPtr v (new StripableNotificationList);
for (CoreSelection::StripableAutomationControls::iterator i = sac.begin(); i != sac.end(); ++i) {
if ((*i).stripable) {
v->push_back (boost::weak_ptr<Stripable> ((*i).stripable));
}
}
if (!v->empty()) {
StripableSelectionChanged (v); /* EMIT SIGNAL */
}
}
}
int