summaryrefslogtreecommitdiffstats
path: root/src/libs/engine/NodeFactory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/engine/NodeFactory.cpp')
-rw-r--r--src/libs/engine/NodeFactory.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp
index eb414978..4ca038b6 100644
--- a/src/libs/engine/NodeFactory.cpp
+++ b/src/libs/engine/NodeFactory.cpp
@@ -179,7 +179,7 @@ NodeFactory::load_lv2_plugins()
SLV2Plugin lv2_plug = slv2_plugins_get_at(plugins, i);
- const string uri((const char*)slv2_plugin_get_uri(lv2_plug));
+ const string uri(slv2_value_as_uri(slv2_plugin_get_uri(lv2_plug)));
#ifndef NDEBUG
assert(_plugins.find(uri) == _plugins.end());
@@ -188,16 +188,9 @@ NodeFactory::load_lv2_plugins()
LV2Plugin* const plugin = new LV2Plugin(_lv2_info, uri);
plugin->slv2_plugin(lv2_plug);
- plugin->library_path(slv2_uri_to_path(slv2_plugin_get_library_uri(lv2_plug)));
- char* const name = slv2_plugin_get_name(lv2_plug);
- if (name) {
- //plugin->name(name);
- free(name);
- _plugins.insert(make_pair(uri, plugin));
- } else {
- cerr << "ERROR: LV2 Plugin " << uri << " has no name. Ignoring." << endl;
- continue;
- }
+ plugin->library_path(slv2_uri_to_path(slv2_value_as_uri(
+ slv2_plugin_get_library_uri(lv2_plug))));
+ _plugins.insert(make_pair(uri, plugin));
}
slv2_plugins_free(_world->slv2_world, plugins);