From 1d31cd008dad7a807c46e5004c10dbc2e97f8475 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 23 Jun 2012 05:07:18 +0000 Subject: [PATCH] Replace use of PBD::sys::path in ARDOUR::find_bindings_files git-svn-id: svn://localhost/ardour2/branches/3.0@12839 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/globals.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 5cd52b67c0..caad270195 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -56,7 +56,7 @@ #include "pbd/fpu.h" #include "pbd/file_utils.h" #include "pbd/enumwriter.h" -#include "pbd/filesystem.h" +#include "pbd/basename.h" #include "midi++/port.h" #include "midi++/manager.h" @@ -373,10 +373,10 @@ ARDOUR::find_bindings_files (map& files) } for (vector::iterator x = found.begin(); x != found.end(); ++x) { - sys::path path(*x); + std::string path(*x); pair namepath; - namepath.second = path.to_string(); - namepath.first = path.leaf().substr (0, path.leaf().find_first_of ('.')); + namepath.second = path; + namepath.first = PBD::basename_nosuffix (path); files.insert (namepath); } }