From 505d37a58f938db53286ac9c2f1ad32ef867a539 Mon Sep 17 00:00:00 2001
From: Taybin Rutkin <taybin@taybin.com>
Date: Fri, 1 Dec 2006 17:37:08 +0000
Subject: Properly encode file URIs in the sfdb.

git-svn-id: svn://localhost/ardour2/trunk@1184 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/audio_library.cc | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'libs/ardour/audio_library.cc')

diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc
index 7a8414946c..92069d929f 100644
--- a/libs/ardour/audio_library.cc
+++ b/libs/ardour/audio_library.cc
@@ -19,6 +19,8 @@
 
 #include <sstream>
 
+#include <libxml/uri.h>
+
 #include <lrdf.h>
 
 #include <pbd/compose.h>
@@ -59,8 +61,19 @@ 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:" << path;
+	uri << "file:" << (const char*) ret;
+	
+	xmlFree (ret);
+	
 	return uri.str();
 }
 
-- 
cgit v1.2.3