From 1b77a3535304c25a49686886054db148442b1032 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Wed, 27 Jun 2007 12:12:14 +0000 Subject: [PATCH] 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 --- libs/ardour/ardour/audio_library.h | 2 -- libs/ardour/audio_library.cc | 11 ++--------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/libs/ardour/ardour/audio_library.h b/libs/ardour/ardour/audio_library.h index 34f3869c0f..86b5fb3aa2 100644 --- 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 39506b0860..c5240988a8 100644 --- 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 tags) { @@ -141,8 +134,8 @@ AudioLibrary::search_members_and (vector& members, const vector 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); -- 2.30.2