diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-14 15:45:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-14 15:45:21 +0000 |
| commit | 4d112a8e6b90fa64a5cd333042044768111ba994 (patch) | |
| tree | 6688c5250bc55de106f74ef9be93d7ee574ec9d8 /libs/ardour/port_set.cc | |
| parent | 875f0befd5fb52678d25544fcbcb6e6b55a2c483 (diff) | |
remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths (may cause issues when loading creatively named 2.X sessions; fix a couple of details of name collection and usage from the startup dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@7772 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/port_set.cc')
| -rw-r--r-- | libs/ardour/port_set.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc index a5fbc9eee6..35c8d9f410 100644 --- 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)) { |