Revert Monitor-Section to be per session

[ardour.git] / libs / ardour / slavable.cc

diff --git a/libs/ardour/slavable.cc b/libs/ardour/slavable.cc
index 7a7b8e291947bc4c85d66b4293357414426f5de5..155fd4f736b3e316cfcd25dc20ed0342b5195d1e 100644 (file)
--- a/libs/ardour/slavable.cc
+++ b/libs/ardour/slavable.cc
@@ -26,10 +26,11 @@
 #include "pbd/xml++.h"
 
 #include "ardour/slavable.h"
+#include "ardour/slavable_automation_control.h"
 #include "ardour/vca.h"
 #include "ardour/vca_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;
@@ -52,13 +53,39 @@ Slavable::get_state () const
        Glib::Threads::RWLock::ReaderLock lm (master_lock);
        for (std::set<uint32_t>::const_iterator i = _masters.begin(); i != _masters.end(); ++i) {
                child = new XMLNode (X_("Master"));
-               child->add_property (X_("number"), to_string (*i, std::dec));
+               child->set_property (X_("number"), *i);
                node->add_child_nocopy (*child);
        }
 
        return *node;
 }
 
+std::vector<boost::shared_ptr<VCA> >
+Slavable::masters (VCAManager* manager) const
+{
+       std::vector<boost::shared_ptr<VCA> > rv;
+       Glib::Threads::RWLock::ReaderLock lm (master_lock);
+       for (std::set<uint32_t>::const_iterator i = _masters.begin(); i != _masters.end(); ++i) {
+               rv.push_back (manager->vca_by_number (*i));
+       }
+       return rv;
+}
+
+bool
+Slavable::assigned_to (VCAManager* manager, boost::shared_ptr<VCA> mst) const
+{
+       if (mst.get () == this) {
+               return true;
+       }
+       std::vector<boost::shared_ptr<VCA> > ml = mst->masters (manager);
+       for (std::vector<boost::shared_ptr<VCA> >::const_iterator i = ml.begin (); i != ml.end(); ++i) {
+               if (assigned_to (manager, *i)) {
+                       return true;
+               }
+       }
+       return false;
+}
+
 int
 Slavable::set_state (XMLNode const& node, int version)
 {
@@ -71,9 +98,8 @@ Slavable::set_state (XMLNode const& node, int version)
 
        for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
                if ((*i)->name() == X_("Master")) {
-                       XMLProperty const* prop = (*i)->property (X_("number"));
-                       if (prop) {
-                               uint32_t n = atoi (prop->value());
+                       uint32_t n;
+                       if ((*i)->get_property (X_("number"), n)) {
                                _masters.insert (n);
                        }
                }
@@ -102,8 +128,16 @@ Slavable::do_assign (VCAManager* manager)
 
        /* now that we've released the lock, we can do the assignments */
 
-       for (std::vector<boost::shared_ptr<VCA> >::iterator v = vcas.begin(); v != vcas.end(); ++v) {
-               assign (*v);
+       if (!vcas.empty()) {
+
+               for (std::vector<boost::shared_ptr<VCA> >::iterator v = vcas.begin(); v != vcas.end(); ++v) {
+                       assign (*v);
+               }
+
+               SlavableControlList scl = slavables ();
+               for (SlavableControlList::iterator i = scl.begin(); i != scl.end(); ++i) {
+                               (*i)->use_saved_master_ratios ();
+               }
        }
 
        assign_connection.disconnect ();
@@ -114,16 +148,94 @@ Slavable::do_assign (VCAManager* manager)
 void
 Slavable::assign (boost::shared_ptr<VCA> v)
 {
-       Glib::Threads::RWLock::WriterLock lm (master_lock);
-       if (assign_controls (v) == 0) {
-               _masters.insert (v->number());
+       assert (v);
+       {
+               Glib::Threads::RWLock::WriterLock lm (master_lock);
+               if (assign_controls (v)) {
+                       _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)));
+       }
+
+       AssignmentChange (v, true);
+}
+
+void
+Slavable::weak_unassign (boost::weak_ptr<VCA> v)
+{
+       boost::shared_ptr<VCA> sv (v.lock());
+       if (sv) {
+               unassign (sv);
        }
 }
 
 void
 Slavable::unassign (boost::shared_ptr<VCA> v)
 {
-       Glib::Threads::RWLock::WriterLock lm (master_lock);
-       (void) unassign_controls (v);
-       _masters.erase (v->number());
+       {
+               Glib::Threads::RWLock::WriterLock lm (master_lock);
+
+               unassign_controls (v);
+               if (v) {
+                       _masters.erase (v->number());
+               } else {
+                       _masters.clear ();
+               }
+       }
+       AssignmentChange (v, false);
+}
+
+bool
+Slavable::assign_controls (boost::shared_ptr<VCA> vca)
+{
+       bool rv = false;
+       SlavableControlList scl = slavables ();
+       for (SlavableControlList::iterator i = scl.begin(); i != scl.end(); ++i) {
+               rv |= assign_control (vca, *i);
+       }
+       return rv;
+}
+
+void
+Slavable::unassign_controls (boost::shared_ptr<VCA> vca)
+{
+       SlavableControlList scl = slavables ();
+       for (SlavableControlList::iterator i = scl.begin(); i != scl.end(); ++i) {
+               unassign_control (vca, *i);
+       }
+}
+
+bool
+Slavable::assign_control (boost::shared_ptr<VCA> vca, boost::shared_ptr<SlavableAutomationControl> slave)
+{
+       boost::shared_ptr<AutomationControl> master;
+       master = vca->automation_control (slave->parameter());
+       if (!master) {
+               return false;
+       }
+       slave->add_master (master);
+       return true;
+}
+
+void
+Slavable::unassign_control (boost::shared_ptr<VCA> vca, boost::shared_ptr<SlavableAutomationControl> slave)
+{
+       if (!vca) {
+               /* unassign from all */
+               slave->clear_masters ();
+       } else {
+               boost::shared_ptr<AutomationControl> master;
+               master = vca->automation_control (slave->parameter());
+               if (master) {
+                       slave->remove_master (master);
+               }
+       }
 }