X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_library.cc;h=39506b086055236be9c52e650ada417198a22ca6;hb=28bf53adccd578849fbb6597d4498e81a87eee91;hp=a15e08d5f9f3f228d0271c0e9d5f6c4b36da6776;hpb=18e65da42b7cd1973313d132c4b89df598863021;p=ardour.git

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<string> 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<string> 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;