obey monitor=disk when recording also; remove debug output

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

diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc
index 6fdfa763cb865f099334c2675e0cc59562c2b8d8..44a5f436a98742e0ea92bff03f096173a3486f3b 100644 (file)
--- a/libs/ardour/port_set.cc
+++ b/libs/ardour/port_set.cc
@@ -1,25 +1,29 @@
 /*
-    Copyright (C) 2006 Paul Davis 
-    
+    Copyright (C) 2006 Paul Davis
+
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the Free
     Software Foundation; either version 2 of the License, or (at your option)
     any later version.
-    
+
     This program is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
     for more details.
-    
+
     You should have received a copy of the GNU General Public License along
     with this program; if not, write to the Free Software Foundation, Inc.,
     675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <string>
+
 #include "ardour/port_set.h"
 #include "ardour/midi_port.h"
 #include "ardour/audio_port.h"
 
+using std::string;
+
 namespace ARDOUR {
 
 PortSet::PortSet()
@@ -30,19 +34,52 @@ PortSet::PortSet()
 
 static bool sort_ports_by_name (Port* a, Port* b)
 {
-       return (a->name() < b->name());
+       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() 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;
+       }
 }
 
 void
 PortSet::add(Port* port)
 {
        PortVec& v = _ports[port->type()];
-       
+
        v.push_back(port);
-       sort(v.begin(), v.end(), sort_ports_by_name);
 
+       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()].size());
 }
 
@@ -88,7 +125,7 @@ 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) {