X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fport_set.cc;h=93fe54ed1c99807336ba609b3a04b8049c5adc80;hb=04c56a0618f668fac288fb2070fcf200a83aebc6;hp=a5fbc9eee6d1976b11e3e14aeccb7efabcb5937f;hpb=98d994f29c968796c5e9822e7c3b1713e53b274d;p=ardour.git diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc index a5fbc9eee6..93fe54ed1c 100644 --- a/libs/ardour/port_set.cc +++ b/libs/ardour/port_set.cc @@ -16,11 +16,14 @@ 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include -#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; namespace ARDOUR { @@ -30,61 +33,78 @@ 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 a, boost::shared_ptr b) +{ + string aname (a->name()); + string bname (b->name()); + + string::size_type last_digit_position_a = aname.size(); + string::reverse_iterator r_iterator = aname.rbegin(); + + while (r_iterator!= aname.rend() && Glib::Unicode::isdigit(*r_iterator)) { + r_iterator++; + last_digit_position_a--; + } + + string::size_type last_digit_position_b = bname.size(); + r_iterator = bname.rbegin(); + + while (r_iterator != bname.rend() && Glib::Unicode::isdigit(*r_iterator)) { + r_iterator++; + last_digit_position_b--; + } + + // if some of the names don't have a number as posfix, compare as strings + + if (last_digit_position_a == aname.size() || last_digit_position_b == bname.size()) { + return aname < bname; + } + + const std::string prefix_a = aname.substr(0, last_digit_position_a - 1); + const unsigned int posfix_a = std::atoi(aname.substr(last_digit_position_a, aname.size() - last_digit_position_a).c_str()); + const std::string prefix_b = bname.substr(0, last_digit_position_b - 1); + const unsigned int posfix_b = std::atoi(bname.substr(last_digit_position_b, bname.size() - last_digit_position_b).c_str()); + + if (prefix_a != prefix_b) { + return aname < bname; + } else { + return posfix_a < posfix_b; + } +} + + +static bool sort_ports_by_type_and_name (boost::shared_ptr a, boost::shared_ptr b) { - Glib::ustring aname (a->name()); - Glib::ustring bname (b->name()); - - Glib::ustring::size_type last_digit_position_a = aname.size(); - Glib::ustring::reverse_iterator r_iterator = aname.rbegin(); - - while (r_iterator!= aname.rend() && Glib::Unicode::isdigit(*r_iterator)) { - r_iterator++; - last_digit_position_a--; - } - - Glib::ustring::size_type last_digit_position_b = bname.size(); - r_iterator = bname.rbegin(); - - while (r_iterator != bname.rend() && Glib::Unicode::isdigit(*r_iterator)) { - r_iterator++; - last_digit_position_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()) { - return aname < bname; - } - - const std::string prefix_a = aname.substr(0, last_digit_position_a - 1); - const unsigned int posfix_a = std::atoi(aname.substr(last_digit_position_a, aname.size() - last_digit_position_a).c_str()); - const std::string prefix_b = bname.substr(0, last_digit_position_b - 1); - const unsigned int posfix_b = std::atoi(bname.substr(last_digit_position_b, bname.size() - last_digit_position_b).c_str()); - - if (prefix_a != prefix_b) { - return aname < bname; - } else { - return posfix_a < posfix_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) { 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) { + PortVec::iterator i = find(_all_ports.begin(), _all_ports.end(), port); + if (i != _all_ports.end()) { + _all_ports.erase(i); + } + for (std::vector::iterator l = _ports.begin(); l != _ports.end(); ++l) { PortVec::iterator i = find(l->begin(), l->end(), port); if (i != l->end()) { @@ -102,63 +122,53 @@ PortSet::remove(Port* port) size_t PortSet::num_ports() const { - size_t ret = 0; - - for (std::vector::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 port) const { - for (std::vector::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 PortSet::port(size_t n) const { - // This is awesome. Awesomely slow. - - size_t size_so_far = 0; - - for (std::vector::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 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(); } -AudioPort* +boost::shared_ptr PortSet::nth_audio_port(size_t n) const { - return dynamic_cast(port(DataType::AUDIO, n)); + return boost::dynamic_pointer_cast (port (DataType::AUDIO, n)); } -MidiPort* +boost::shared_ptr PortSet::nth_midi_port(size_t n) const { - return dynamic_cast(port(DataType::MIDI, n)); + return boost::dynamic_pointer_cast (port (DataType::MIDI, n)); +} + +void +PortSet::clear() +{ + _ports.clear(); + _all_ports.clear(); } } // namepace ARDOUR