move VCA assignment up to Route level

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

diff --git a/libs/ardour/vca_manager.cc b/libs/ardour/vca_manager.cc
index 4daae2e9e28d39b18a9abfc4b487b81ba962936d..6cc287554afd035b1bf9feb49fa6ee3fe37a129c 100644 (file)
--- a/libs/ardour/vca_manager.cc
+++ b/libs/ardour/vca_manager.cc
@@ -18,6 +18,7 @@
 */
 
 #include "pbd/convert.h"
+#include "pbd/error.h"
 #include "pbd/replace_all.h"
 
 #include "ardour/vca.h"
@@ -27,12 +28,14 @@
 
 using namespace ARDOUR;
 using namespace Glib::Threads;
+using namespace PBD;
 using std::string;
 
 string VCAManager::xml_node_name (X_("VCAManager"));
 
 VCAManager::VCAManager (Session& s)
        : SessionHandleRef (s)
+       , _vcas_loaded (false)
 {
 }
 
@@ -73,7 +76,9 @@ VCAManager::create_vca (uint32_t howmany, std::string const & name_template)
                                replace_all (name, "%n", sn);
                        }
 
-                       boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, name, num));
+                       boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, num, name));
+
+                       vca->init ();
 
                        _vcas.push_back (vca);
                        vcal.push_back (vca);
@@ -140,20 +145,34 @@ VCAManager::set_state (XMLNode const& node, int version)
        XMLNodeList const & children = node.children();
        VCAList vcal;
 
-       {
+       _vcas_loaded = false;
 
-               Mutex::Lock lm (lock);
+       for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
+               if ((*i)->name() == VCA::xml_node_name) {
+                       boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, 0, X_("tobereset")));
 
-               for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
-                       if ((*i)->name() == VCA::xml_node_name) {
-                               std::cerr << "Adding VCA from XML\n";
-                               boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, **i, version));
+                       if (vca->init() || vca->set_state (**i, version)) {
+                               error << _("Cannot set state of a VCA") << endmsg;
+                               return -1;
+                       }
+
+                       /* can't hold the lock for the entire loop,
+                        * because the new VCA maybe slaved and needs
+                        * to call back into us to set up its own
+                        * slave/master relationship
+                        */
+
+                       {
+                               Mutex::Lock lm (lock);
                                _vcas.push_back (vca);
                                vcal.push_back (vca);
                        }
                }
        }
 
+       _vcas_loaded = true;
+
+       VCAsLoaded (); /* EMIT SIGNAL */
        VCAAdded (vcal); /* EMIT SIGNAL */
 
        return 0;