From 28bf53adccd578849fbb6597d4498e81a87eee91 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Wed, 27 Jun 2007 12:12:12 +0000 Subject: Remove AudioLibrary::path2uri and use Glib::filename_to_uri instead git-svn-id: svn://localhost/ardour2/trunk@2047 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/audio_library.h | 1 - libs/ardour/audio_library.cc | 23 ++--------------------- 2 files changed, 2 insertions(+), 22 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/ardour/audio_library.h b/libs/ardour/ardour/audio_library.h index 8c01f0e3dc..34f3869c0f 100644 --- a/libs/ardour/ardour/audio_library.h +++ b/libs/ardour/ardour/audio_library.h @@ -46,7 +46,6 @@ class AudioLibrary private: string src; - string path2uri (string path); string uri2path (string uri); }; diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc index a15e08d5f9..39506b0860 100644 --- a/libs/ardour/audio_library.cc +++ b/libs/ardour/audio_library.cc @@ -69,25 +69,6 @@ AudioLibrary::save_changes () } } -string -AudioLibrary::path2uri (string path) -{ - xmlURI temp; - memset(&temp, 0, sizeof(temp)); - - xmlChar *cal = xmlCanonicPath((xmlChar*) path.c_str()); - temp.path = (char *) cal; - xmlChar *ret = xmlSaveUri(&temp); - xmlFree(cal); - - stringstream uri; - uri << "file:" << (const char*) ret; - - xmlFree (ret); - - return uri.str(); -} - string AudioLibrary::uri2path (string uri) { @@ -101,7 +82,7 @@ AudioLibrary::set_tags (string member, vector tags) sort (tags.begin(), tags.end()); tags.erase (unique(tags.begin(), tags.end()), tags.end()); - string file_uri(path2uri(member)); + const string file_uri(Glib::filename_to_uri (member)); lrdf_remove_uri_matches (file_uri.c_str()); @@ -116,7 +97,7 @@ AudioLibrary::get_tags (string member) vector tags; lrdf_statement pattern; - pattern.subject = strdup(path2uri(member).c_str()); + pattern.subject = strdup(Glib::filename_to_uri(member).c_str()); pattern.predicate = TAG; pattern.object = 0; pattern.object_type = lrdf_literal; -- cgit v1.2.3