diff options
| author | David Robillard <d@drobilla.net> | 2015-02-13 21:59:11 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-02-13 22:00:38 -0500 |
| commit | 5b3ff655f1f8b2518b21110a5e15f3bef832f381 (patch) | |
| tree | a49984834ab35bdf76ff7ed46302a9c70ff517cb /gtk2_ardour/lv2_plugin_ui.cc | |
| parent | 3cc0f59d51e80c891d2361cdd2d5b7ccd42761e9 (diff) | |
Fix LV2 UIs with spacey paths (e.g. Pianoteq).
Diffstat (limited to 'gtk2_ardour/lv2_plugin_ui.cc')
| -rw-r--r-- | gtk2_ardour/lv2_plugin_ui.cc | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc index c732aca567..8a6d5260b4 100644 --- a/gtk2_ardour/lv2_plugin_ui.cc +++ b/gtk2_ardour/lv2_plugin_ui.cc @@ -282,7 +282,21 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title) _lv2->enable_ui_emission(); } - const LilvUI* ui = (const LilvUI*)_lv2->c_ui(); + const LilvUI* ui = (const LilvUI*)_lv2->c_ui(); + const LilvNode* bundle = lilv_ui_get_bundle_uri(ui); + const LilvNode* binary = lilv_ui_get_binary_uri(ui); +#ifdef HAVE_LILV_0_21_1 + char* ui_bundle_path = lilv_file_uri_parse(lilv_node_as_uri(bundle), NULL); + char* ui_binary_path = lilv_file_uri_parse(lilv_node_as_uri(binary), NULL); +#else + char* ui_bundle_path = strdup(lilv_uri_to_path(lilv_node_as_uri(bundle))); + char* ui_binary_path = strdup(lilv_uri_to_path(lilv_node_as_uri(binary))); +#endif + if (!ui_bundle_path || !ui_binary_path) { + error << _("failed to get path for UI bindle or binary") << endmsg; + return; + } + _inst = suil_instance_new( ui_host, this, @@ -290,10 +304,12 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title) _lv2->uri(), lilv_node_as_uri(lilv_ui_get_uri(ui)), lilv_node_as_uri((const LilvNode*)_lv2->c_ui_type()), - lilv_uri_to_path(lilv_node_as_uri(lilv_ui_get_bundle_uri(ui))), - lilv_uri_to_path(lilv_node_as_uri(lilv_ui_get_binary_uri(ui))), + ui_bundle_path, + ui_binary_path, features); + free(ui_bundle_path); + free(ui_binary_path); free(features); #define GET_WIDGET(inst) suil_instance_get_widget((SuilInstance*)inst); |