expose more info from plugin-strip (for GUI display)

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

diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc
index 8ad8531f5d1c32a31fe68c7c244a389b2326538a..93fe54ed1c99807336ba609b3a04b8049c5adc80 100644 (file)
--- a/libs/ardour/port_set.cc
+++ b/libs/ardour/port_set.cc
@@ -18,9 +18,10 @@
 
 #include <string>
 
-#include "ardour/port_set.h"
-#include "ardour/midi_port.h"
 #include "ardour/audio_port.h"
+#include "ardour/midi_port.h"
+#include "ardour/port.h"
+#include "ardour/port_set.h"
 
 using std::string;
 
@@ -55,7 +56,7 @@ static bool sort_ports_by_name (boost::shared_ptr<Port> a, boost::shared_ptr<Por
 
        // if some of the names don't have a number as posfix, compare as strings
 
-       if (last_digit_position_a == aname.size() or last_digit_position_b == bname.size()) {
+       if (last_digit_position_a == aname.size() || last_digit_position_b == bname.size()) {
                return aname < bname;
        }
 
@@ -71,14 +72,27 @@ static bool sort_ports_by_name (boost::shared_ptr<Port> a, boost::shared_ptr<Por
        }
 }
 
+
+static bool sort_ports_by_type_and_name (boost::shared_ptr<Port> a, boost::shared_ptr<Port> b)
+{
+       if (a->type() != b->type()) {
+               return a->type() < b->type();
+       }
+
+       return sort_ports_by_name (a, b);
+}
+
 void
 PortSet::add (boost::shared_ptr<Port> port)
 {
        PortVec& v = _ports[port->type()];
 
        v.push_back(port);
+       _all_ports.push_back(port);
 
        sort(v.begin(), v.end(), sort_ports_by_name);
+       sort(_all_ports.begin(), _all_ports.end(), sort_ports_by_type_and_name);
+
        _count.set(port->type(), _count.get(port->type()) + 1);
        assert(_count.get(port->type()) == _ports[port->type()].size());
 }
@@ -86,6 +100,11 @@ PortSet::add (boost::shared_ptr<Port> port)
 bool
 PortSet::remove (boost::shared_ptr<Port> port)
 {
+       PortVec::iterator i = find(_all_ports.begin(), _all_ports.end(), port);
+       if (i != _all_ports.end()) {
+               _all_ports.erase(i);
+       }
+
        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()) {
@@ -103,40 +122,20 @@ PortSet::remove (boost::shared_ptr<Port> port)
 size_t
 PortSet::num_ports() const
 {
-       size_t ret = 0;
-
-       for (std::vector<PortVec>::const_iterator l = _ports.begin(); l != _ports.end(); ++l)
-               ret += (*l).size();
-
-       return ret;
+       return _all_ports.size();
 }
 
 bool
 PortSet::contains (boost::shared_ptr<const Port> port) const
 {
-       for (std::vector<PortVec>::const_iterator l = _ports.begin(); l != _ports.end(); ++l)
-               if (find (l->begin(), l->end(), port) != l->end())
-                       return true;
-
-       return false;
+       return find(_all_ports.begin(), _all_ports.end(), port) != _all_ports.end();
 }
 
 boost::shared_ptr<Port>
 PortSet::port(size_t n) const
 {
-       // This is awesome.  Awesomely slow.
-
-       size_t size_so_far = 0;
-
-       for (std::vector<PortVec>::const_iterator l = _ports.begin(); l != _ports.end(); ++l) {
-               if (n < size_so_far + l->size()) {
-                       return (*l)[n - size_so_far];
-               } else {
-                       size_so_far += l->size();
-               }
-       }
-
-       return boost::shared_ptr<Port> (); // n out of range
+       assert(n < _all_ports.size());
+       return _all_ports[n];
 }
 
 boost::shared_ptr<Port>
@@ -146,9 +145,11 @@ PortSet::port(DataType type, size_t n) const
                return port(n);
        } else {
                const PortVec& v = _ports[type];
-               assert(n < v.size());
-               return v[n];
+               if (n < v.size()) {
+                       return v[n];
+               }
        }
+       return boost::shared_ptr<Port>();
 }
 
 boost::shared_ptr<AudioPort>
@@ -163,4 +164,11 @@ PortSet::nth_midi_port(size_t n) const
        return boost::dynamic_pointer_cast<MidiPort> (port (DataType::MIDI, n));
 }
 
+void
+PortSet::clear()
+{
+       _ports.clear();
+       _all_ports.clear();
+}
+
 } // namepace ARDOUR