Remove AudioLibrary::path2uri and use Glib::filename_to_uri instead

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

diff --git a/libs/ardour/ardour/audio_library.h b/libs/ardour/ardour/audio_library.h
index 8c01f0e3dc1562176fd78b213081e563391d5993..34f3869c0faaa1a233bd2d73d1dd948b7a95c5f8 100644 (file)
--- 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 a15e08d5f9f3f228d0271c0e9d5f6c4b36da6776..39506b086055236be9c52e650ada417198a22ca6 100644 (file)
--- 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;