Optimize automation-event process splitting

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

diff --git a/libs/ardour/vca_manager.cc b/libs/ardour/vca_manager.cc
index d7ad6ea851fbf11c2d2874806f9a1f3f9c0cb38a..90a1233087938226947ef299a54691735ebd764e 100644 (file)
--- a/libs/ardour/vca_manager.cc
+++ b/libs/ardour/vca_manager.cc
@@ -17,14 +17,18 @@
 
 */
 
-#include "pbd/convert.h"
 #include "pbd/error.h"
 #include "pbd/replace_all.h"
+#include "pbd/string_convert.h"
 
+#include "ardour/boost_debug.h"
+#include "ardour/selection.h"
+#include "ardour/session.h"
+#include "ardour/slavable.h"
 #include "ardour/vca.h"
 #include "ardour/vca_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Glib::Threads;
@@ -47,8 +51,24 @@ VCAManager::~VCAManager ()
 void
 VCAManager::clear ()
 {
-       Mutex::Lock lm (lock);
-       _vcas.clear ();
+       bool send = false;
+       {
+               Mutex::Lock lm (lock);
+               for (VCAList::const_iterator i = _vcas.begin(); i != _vcas.end(); ++i) {
+                       if ((*i)->is_selected ()) {
+                               _session.selection().remove_stripable_by_id ((*i)->id());
+                               send = true;
+                       }
+                       (*i)->DropReferences ();
+               }
+               _vcas.clear ();
+       }
+
+       if (send && !_session.deletion_in_progress ()) {
+               PropertyChange pc;
+               pc.add (Properties::selected);
+               PresentationInfo::Change (pc);
+       }
 }
 
 VCAList
@@ -58,11 +78,13 @@ VCAManager::vcas () const
        return _vcas;
 }
 
-int
+VCAList
 VCAManager::create_vca (uint32_t howmany, std::string const & name_template)
 {
        VCAList vcal;
 
+       uint32_t n_stripables = _session.nstripables ();
+
        {
                Mutex::Lock lm (lock);
 
@@ -72,13 +94,15 @@ VCAManager::create_vca (uint32_t howmany, std::string const & name_template)
                        string name = name_template;
 
                        if (name.find ("%n")) {
-                               string sn = PBD::to_string (num, std::dec);
+                               string sn = PBD::to_string (num);
                                replace_all (name, "%n", sn);
                        }
 
                        boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, num, name));
+                       BOOST_MARK_VCA (vca);
 
                        vca->init ();
+                       vca->set_presentation_order (n + n_stripables);
 
                        _vcas.push_back (vca);
                        vcal.push_back (vca);
@@ -87,9 +111,10 @@ VCAManager::create_vca (uint32_t howmany, std::string const & name_template)
 
        VCAAdded (vcal); /* EMIT SIGNAL */
 
-       return 0;
-}
+       _session.set_dirty ();
 
+       return vcal;
+}
 
 void
 VCAManager::remove_vca (boost::shared_ptr<VCA> vca)
@@ -99,14 +124,21 @@ VCAManager::remove_vca (boost::shared_ptr<VCA> vca)
                _vcas.remove (vca);
        }
 
-       VCAList vcal;
-       vcal.push_back (vca);
+       /* this should cause deassignment and deletion */
+
+       vca->DropReferences ();
 
-       VCARemoved (vcal); /* EMIT SIGNAL */
+       if (vca->is_selected () && !_session.deletion_in_progress ()) {
+               _session.selection().remove_stripable_by_id (vca->id());
+               PropertyChange pc;
+               pc.add (Properties::selected);
+               PresentationInfo::Change (pc);
+       }
+       _session.set_dirty ();
 }
 
 boost::shared_ptr<VCA>
-VCAManager::vca_by_number (uint32_t n) const
+VCAManager::vca_by_number (int32_t n) const
 {
        Mutex::Lock lm (lock);
 
@@ -119,6 +151,20 @@ VCAManager::vca_by_number (uint32_t n) const
        return boost::shared_ptr<VCA>();
 }
 
+boost::shared_ptr<VCA>
+VCAManager::vca_by_name (std::string const& name) const
+{
+       Mutex::Lock lm (lock);
+
+       for (VCAList::const_iterator i = _vcas.begin(); i != _vcas.end(); ++i) {
+               if ((*i)->name() == name || (*i)->full_name() == name) {
+                       return *i;
+               }
+       }
+
+       return boost::shared_ptr<VCA>();
+}
+
 XMLNode&
 VCAManager::get_state ()
 {
@@ -150,6 +196,7 @@ VCAManager::set_state (XMLNode const& node, int version)
        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")));
+                       BOOST_MARK_VCA (vca);
 
                        if (vca->init() || vca->set_state (**i, version)) {
                                error << _("Cannot set state of a VCA") << endmsg;
@@ -172,7 +219,6 @@ VCAManager::set_state (XMLNode const& node, int version)
 
        _vcas_loaded = true;
 
-       VCAsLoaded (); /* EMIT SIGNAL */
        VCAAdded (vcal); /* EMIT SIGNAL */
 
        return 0;