Apply MIDI looping patch from torbenh, with minor changes.

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

diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc
index 3d6ab8c5374161d17330eb993babfd61485bb265..3182c2b9598a5f7301d0c0e25796f2743fbd8774 100644 (file)
--- a/libs/ardour/port_set.cc
+++ b/libs/ardour/port_set.cc
@@ -32,21 +32,32 @@ static bool sort_ports_by_name (Port* a, Port* b)
 }
 
 void
-PortSet::add_port(Port* port)
+PortSet::add(Port* port)
 {
-       const size_t list_index = port->type().to_index();
-       assert(list_index < _ports.size());
-       
-       PortVec& v = _ports[list_index];
+       PortVec& v = _ports[port->type()];
        
        v.push_back(port);
        sort(v.begin(), v.end(), sort_ports_by_name);
 
        _count.set(port->type(), _count.get(port->type()) + 1);
 
-       assert(_count.get(port->type()) == _ports[port->type().to_index()].size());
+       assert(_count.get(port->type()) == _ports[port->type()].size());
 }
 
+bool
+PortSet::remove(Port* port)
+{
+       for (std::vector<PortVec>::iterator l = _ports.begin(); l != _ports.end(); ++l) {
+               PortVec::iterator i = find(l->begin(), l->end(), port);
+               if (i != l->end()) {
+                       l->erase(i);
+                       _count.set(port->type(), _count.get(port->type()) - 1);
+                       return true;
+               }
+       }
+
+       return false;
+}
 
 /** Get the total number of ports (of all types) in the PortSet
  */
@@ -74,7 +85,7 @@ PortSet::contains(const Port* port) const
 Port*
 PortSet::port(size_t n) const
 {
-       // This is awesome
+       // This is awesome.  Awesomely slow.
        
        size_t size_so_far = 0;
 
@@ -94,7 +105,7 @@ PortSet::port(DataType type, size_t n) const
        if (type == DataType::NIL) {
                return port(n);
        } else {
-               const PortVec& v = _ports[type.to_index()];
+               const PortVec& v = _ports[type];
                assert(n < v.size());
                return v[n];
        }