diff --git a/src/portmanager.cpp b/src/portmanager.cpp index 9b7c877..1bae4f3 100644 --- a/src/portmanager.cpp +++ b/src/portmanager.cpp @@ -272,36 +272,26 @@ Port *PortManager::FindPort(jack_port_t *port) return NULL; } -static bool ClientSortPredicate(const Client *lhs, const Client *rhs) -{ - return lhs->m_name < rhs->m_name; -} - -static bool PortGroupSortPredicate(const PortGroup *lhs, const PortGroup *rhs) -{ - return lhs->m_name < rhs->m_name; -} - -static bool PortSortPredicate(const Port *lhs, const Port *rhs) +static bool BaseSortPredicate(const Base *lhs, const Base *rhs) { return lhs->m_name < rhs->m_name; } void PortManager::Sort() { - m_clients.sort(&ClientSortPredicate); + m_clients.sort(&BaseSortPredicate); ClientList::iterator clit; for (clit = m_clients.begin(); clit != m_clients.end(); ++clit) { Client *c = *clit; - c->m_groups.sort(&PortGroupSortPredicate); + c->m_groups.sort(&BaseSortPredicate); PortGroupList::iterator pglit; for (pglit = c->m_groups.begin(); pglit != c->m_groups.end(); ++pglit) { PortGroup *pg = *pglit; - pg->m_ports.sort(&PortSortPredicate); + pg->m_ports.sort(&BaseSortPredicate); } } }