ardour/livetrax
13
0
Fork 0
Code

Add Slavable::AssignmentChanged signal to notify when a slavable is assigned/unassigned to/from a master

Browse Source
This commit is contained in:
Paul Davis 2016-12-12 18:43:47 +00:00
parent afa6720288
commit e37bfffca5
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/slavable.h
View File

@ -52,6 +52,8 @@ class LIBARDOUR_API Slavable
void assign (boost::shared_ptr<VCA>);
void unassign (boost::shared_ptr<VCA>);
PBD::Signal2<void,boost::shared_ptr<VCA>,bool> AssignmentChange;
virtual boost::shared_ptr<AutomationControl> automation_control (const Evoral::Parameter& id) = 0;
static std::string xml_node_name;

42
libs/ardour/slavable.cc
View File

@ -117,19 +117,23 @@ void
Slavable::assign (boost::shared_ptr<VCA> v)
{
assert (v);
Glib::Threads::RWLock::WriterLock lm (master_lock);
if (assign_controls (v) == 0) {
_masters.insert (v->number());
{
Glib::Threads::RWLock::WriterLock lm (master_lock);
if (assign_controls (v) == 0) {
_masters.insert (v->number());
}
/* Do NOT use ::unassign() because it will store a
* boost::shared_ptr<VCA> in the functor, leaving a dangling ref to the
* VCA.
*/
v->Drop.connect_same_thread (unassign_connections, boost::bind (&Slavable::weak_unassign, this, boost::weak_ptr<VCA>(v)));
v->DropReferences.connect_same_thread (unassign_connections, boost::bind (&Slavable::weak_unassign, this, boost::weak_ptr<VCA>(v)));
}
/* Do NOT use ::unassign() because it will store a
* boost::shared_ptr<VCA> in the functor, leaving a dangling ref to the
* VCA.
*/
v->Drop.connect_same_thread (unassign_connections, boost::bind (&Slavable::weak_unassign, this, boost::weak_ptr<VCA>(v)));
v->DropReferences.connect_same_thread (unassign_connections, boost::bind (&Slavable::weak_unassign, this, boost::weak_ptr<VCA>(v)));
AssignmentChange (v, true);
}
void
@ -144,13 +148,17 @@ Slavable::weak_unassign (boost::weak_ptr<VCA> v)
void
Slavable::unassign (boost::shared_ptr<VCA> v)
{
Glib::Threads::RWLock::WriterLock lm (master_lock);
(void) unassign_controls (v);
if (v) {
_masters.erase (v->number());
} else {
_masters.clear ();
{
Glib::Threads::RWLock::WriterLock lm (master_lock);
(void) unassign_controls (v);
if (v) {
_masters.erase (v->number());
} else {
_masters.clear ();
}
}
AssignmentChange (v, false);
}
/* Gain, solo & mute are currently the only controls that are