Fix the horrible mess that was anything related to sources and paths.

[ardour.git] / libs / ardour / audio_library.cc

diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc
index 2ed4739a961fe357e58caf49821ebf657d8cccfd..42ec5378307f08fc92d5c5a492649072080d067a 100644 (file)
--- a/libs/ardour/audio_library.cc
+++ b/libs/ardour/audio_library.cc
@@ -22,26 +22,39 @@
 #include <libxml/uri.h>
 
 #include <lrdf.h>
+#include <glibmm/miscutils.h>
+
+#include <glibmm/convert.h>
 
 #include <pbd/compose.h>
 
 #include <ardour/audio_library.h>
 #include <ardour/utils.h>
+#include <ardour/filesystem_paths.h>
 
 #include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 
-static char* TAG = "http://ardour.org/ontology/Tag";
+namespace {
+       const char* const sfdb_file_name = "sfdb";
+} // anonymous namespace
+
+static const char* TAG = "http://ardour.org/ontology/Tag";
 
 AudioLibrary::AudioLibrary ()
 {
-       src = "file:" + get_user_ardour_path() + "sfdb";
+       sys::path sfdb_file_path(user_config_directory ());
 
+       sfdb_file_path /= sfdb_file_name;
+
+       src = Glib::filename_to_uri (sfdb_file_path.to_string ());
+       
        // workaround for possible bug in raptor that crashes when saving to a
        // non-existant file.
-       touch_file(get_user_ardour_path() + "sfdb");
+
+       touch_file(sfdb_file_path.to_string());
 
        lrdf_read_file(src.c_str());
 }
@@ -58,39 +71,13 @@ 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)
-{
-       string path = xmlURIUnescapeString(uri.c_str(), 0, 0);
-       return path.substr(5);
-}
-
 void
 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());
        
@@ -105,8 +92,8 @@ AudioLibrary::get_tags (string member)
        vector<string> tags;
        
        lrdf_statement pattern;
-       pattern.subject = strdup(path2uri(member).c_str());
-       pattern.predicate = TAG;
+       pattern.subject = strdup(Glib::filename_to_uri(member).c_str());
+       pattern.predicate = (char*)TAG;
        pattern.object = 0;
        pattern.object_type = lrdf_literal;
        
@@ -138,8 +125,8 @@ AudioLibrary::search_members_and (vector<string>& members, const vector<string>
        vector<string>::const_iterator i;
        for (i = tags.begin(); i != tags.end(); ++i){
                pattern = new lrdf_statement;
-               pattern->subject = "?";
-               pattern->predicate = TAG;
+               pattern->subject = (char*)"?";
+               pattern->predicate = (char*)TAG;
                pattern->object = strdup((*i).c_str());
                pattern->next = old;
 
@@ -149,8 +136,7 @@ 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]));
+                       members.push_back(Glib::filename_from_uri(ulist->items[j]));
                }
                lrdf_free_uris(ulist);