update route/processor semantics

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

diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc
index 2105d184fb9e3921b27f3d6b0b082ae96675f08f..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;
 
@@ -32,7 +33,7 @@ PortSet::PortSet()
                _ports.push_back( PortVec() );
 }
 
-static bool sort_ports_by_name (Port* a, Port* b)
+static bool sort_ports_by_name (boost::shared_ptr<Port> a, boost::shared_ptr<Port> b)
 {
        string aname (a->name());
        string bname (b->name());
@@ -55,7 +56,7 @@ static bool sort_ports_by_name (Port* a, Port* b)
 
        // 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,22 +72,39 @@ static bool sort_ports_by_name (Port* a, Port* b)
        }
 }
 
+
+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(Port* port)
+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());
 }
 
 bool
-PortSet::remove(Port* port)
+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()) {
@@ -104,63 +122,53 @@ PortSet::remove(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(const Port* port) const
+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();
 }
 
-Port*
+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 NULL; // n out of range
+       assert(n < _all_ports.size());
+       return _all_ports[n];
 }
 
-Port*
+boost::shared_ptr<Port>
 PortSet::port(DataType type, size_t n) const
 {
        if (type == DataType::NIL) {
                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>();
 }
 
-AudioPort*
+boost::shared_ptr<AudioPort>
 PortSet::nth_audio_port(size_t n) const
 {
-       return dynamic_cast<AudioPort*>(port(DataType::AUDIO, n));
+       return boost::dynamic_pointer_cast<AudioPort> (port (DataType::AUDIO, n));
 }
 
-MidiPort*
+boost::shared_ptr<MidiPort>
 PortSet::nth_midi_port(size_t n) const
 {
-       return dynamic_cast<MidiPort*>(port(DataType::MIDI, n));
+       return boost::dynamic_pointer_cast<MidiPort> (port (DataType::MIDI, n));
+}
+
+void
+PortSet::clear()
+{
+       _ports.clear();
+       _all_ports.clear();
 }
 
 } // namepace ARDOUR