ardour/livetrax
13
0
Fork 0
Code

fix some bugs with unassigning from a control master

Browse Source
This commit is contained in:
Paul Davis 2016-05-19 13:10:05 -04:00
parent c6ad232796
commit 637379d7a2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/ardour/slavable.cc
View File

@ -126,7 +126,11 @@ Slavable::unassign (boost::shared_ptr<VCA> v)
{
Glib::Threads::RWLock::WriterLock lm (master_lock);
(void) unassign_controls (v);
_masters.erase (v->number());
if (v) {
_masters.erase (v->number());
} else {
_masters.clear ();
}
}
int
@ -173,14 +177,19 @@ Slavable::unassign_controls (boost::shared_ptr<VCA> vca)
for (uint32_t n = 0; types[n] != NullAutomation; ++n) {
slave = boost::dynamic_pointer_cast<SlavableAutomationControl> (automation_control (types[n]));
if (!vca) {
/* unassign from all */
slave->clear_masters ();
if (slave) {
slave->clear_masters ();
}
} else {
slave->remove_master (master);
master = vca->automation_control (types[n]);
if (slave && master) {
slave->remove_master (master);
}
}
}
return 0;
}