From 026314f1103dee1dccc7b324b5f09c0ff4981ced Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 29 Jan 2015 22:49:40 +0000 Subject: Add lilv_file_uri_parse() for correct URI to path conversion. git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@5528 a436a847-0d15-0410-975c-d299462d15a1 --- src/jalv.c | 12 ++++++++++-- wscript | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/jalv.c b/src/jalv.c index a50216a..d3da181 100644 --- a/src/jalv.c +++ b/src/jalv.c @@ -698,6 +698,11 @@ jalv_ui_instantiate(Jalv* jalv, const char* native_ui_type, void* parent) NULL }; + const char* bundle_uri = lilv_node_as_uri(lilv_ui_get_bundle_uri(jalv->ui)); + const char* binary_uri = lilv_node_as_uri(lilv_ui_get_binary_uri(jalv->ui)); + char* bundle_path = lilv_file_uri_parse(bundle_uri, NULL); + char* binary_path = lilv_file_uri_parse(binary_uri, NULL); + jalv->ui_instance = suil_instance_new( jalv->ui_host, jalv, @@ -705,10 +710,13 @@ jalv_ui_instantiate(Jalv* jalv, const char* native_ui_type, void* parent) lilv_node_as_uri(lilv_plugin_get_uri(jalv->plugin)), lilv_node_as_uri(lilv_ui_get_uri(jalv->ui)), lilv_node_as_uri(jalv->ui_type), - lilv_uri_to_path(lilv_node_as_uri(lilv_ui_get_bundle_uri(jalv->ui))), - lilv_uri_to_path(lilv_node_as_uri(lilv_ui_get_binary_uri(jalv->ui))), + bundle_path, + binary_path, ui_features); + free(binary_path); + free(bundle_path); + /* Set initial control values on UI */ if (jalv->ui_instance) { for (uint32_t i = 0; i < jalv->num_ports; ++i) { diff --git a/wscript b/wscript index be9f67b..6feb190 100644 --- a/wscript +++ b/wscript @@ -35,7 +35,7 @@ def configure(conf): autowaf.check_pkg(conf, 'lv2', atleast_version='1.8.1', uselib_store='LV2') autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV', - atleast_version='0.19.2', mandatory=True) + atleast_version='0.21.0', mandatory=True) autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD', atleast_version='0.14.0', mandatory=True) autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD', -- cgit v1.2.1