Don't strip suffixes twice from peakfile names, otherwise source names like fred...

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

diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc
index a5fbc9eee6d1976b11e3e14aeccb7efabcb5937f..35c8d9f410dcc33cf9839d36ea8e23472aa1a0f9 100644 (file)
--- a/libs/ardour/port_set.cc
+++ b/libs/ardour/port_set.cc
@@ -16,12 +16,14 @@
     675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <glibmm/ustring.h>
+#include <string>
 
 #include "ardour/port_set.h"
 #include "ardour/midi_port.h"
 #include "ardour/audio_port.h"
 
+using std::string;
+
 namespace ARDOUR {
 
 PortSet::PortSet()
@@ -32,18 +34,18 @@ PortSet::PortSet()
 
 static bool sort_ports_by_name (Port* a, Port* b)
 {
-        Glib::ustring aname (a->name());
-        Glib::ustring bname (b->name());
+        string aname (a->name());
+        string bname (b->name());
         
-        Glib::ustring::size_type last_digit_position_a = aname.size();
-        Glib::ustring::reverse_iterator r_iterator = aname.rbegin();
+        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--;
         }
         
-        Glib::ustring::size_type last_digit_position_b = bname.size();
+        string::size_type last_digit_position_b = bname.size();
         r_iterator = bname.rbegin();
         
         while (r_iterator != bname.rend() && Glib::Unicode::isdigit(*r_iterator)) {