Remove AudioLibrary::uri2path and use Glib::filename_from_path in its place

git-svn-id: svn://localhost/ardour2/trunk@2048 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/audio_library.h b/libs/ardour/ardour/audio_library.h
index 34f3869c0faaa1a233bd2d73d1dd948b7a95c5f8..86b5fb3aa216521dbb4e20cddd1ba9c9219e8843 100644 (file)
--- a/libs/ardour/ardour/audio_library.h
+++ b/libs/ardour/ardour/audio_library.h
@@ -45,8 +45,6 @@ class AudioLibrary
        
   private:
        string src;
-       
-       string uri2path (string uri);   
 };
 
 extern AudioLibrary* Library;

diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc
index 39506b086055236be9c52e650ada417198a22ca6..c5240988a8cd186d2c65c169a48cb029c9b3724c 100644 (file)
--- a/libs/ardour/audio_library.cc
+++ b/libs/ardour/audio_library.cc
@@ -69,13 +69,6 @@ AudioLibrary::save_changes ()
        }
 }
 
-string
-AudioLibrary::uri2path (string uri)
-{
-       string path = xmlURIUnescapeString(uri.c_str(), 0, 0);
-       return path.substr(5);
-}
-
 void
 AudioLibrary::set_tags (string member, vector<string> tags)
 {
@@ -141,8 +134,8 @@ AudioLibrary::search_members_and (vector<string>& members, const vector<string>
        if (*head != 0) {
                lrdf_uris* ulist = lrdf_match_multi(*head);
                for (uint32_t j = 0; ulist && j < ulist->count; ++j) {
-//                     cerr << "AND: " << uri2path(ulist->items[j]) << endl;
-                       members.push_back(uri2path(ulist->items[j]));
+//                     cerr << "AND: " << Glib::filename_from_uri(ulist->items[j]) << endl;
+                       members.push_back(Glib::filename_from_uri(ulist->items[j]));
                }
                lrdf_free_uris(ulist);